tweak patches; add forwarding info and resolved releases
authormirabilos <tg@debian.org>
Sun, 12 Jul 2020 13:54:03 +0000 (15:54 +0200)
committermirabilos <mirabilos@evolvis.org>
Sun, 12 Jul 2020 13:54:03 +0000 (15:54 +0200)
13 files changed:
debian/patches/debian-specific/debundle-fonts.diff
debian/patches/debian-specific/debundle-openssl.diff
debian/patches/experiments/musescore-2.1.0-qt-5.12.patch
debian/patches/series
debian/patches/upstream/better-batch-convert.diff
debian/patches/upstream/file-dialogues.diff [moved from debian/patches/experiments/file-dialogues.diff with 100% similarity]
debian/patches/upstream/lyrics-hyphen-syllable-closer.diff
debian/patches/upstream/mscx-reproducible-save-chordlist.diff
debian/patches/upstream/mtest-fix-freetype-includes.diff
debian/patches/upstream/new-manpage.diff
debian/patches/upstream/save-locale-dependent-preferences.diff
debian/patches/upstream/testsuite.diff
debian/patches/upstream/update-AppData.diff

index b2881cc..4ee2e12 100644 (file)
@@ -27,14 +27,13 @@ Justification: distribution-specific packaging
              ":/fonts/bravura/BravuraText.otf",
 --- a/mscore/CMakeLists.txt
 +++ b/mscore/CMakeLists.txt
-@@ -136,9 +136,7 @@ else (APPLE)
-             musescorefonts-MScore.qrc
+@@ -137,8 +137,7 @@ else (APPLE)
              musescorefonts-Gootville.qrc
              musescorefonts-Bravura.qrc
--            musescorefonts-MuseJazz.qrc
+             musescorefonts-MuseJazz.qrc
 -            musescorefonts-FreeSerif.qrc
 -            musescorefonts-Free.qrc)
-+            musescorefonts-MuseJazz.qrc)
++            )
  endif (APPLE)
  
  
index 0aafa27..fc1a1b4 100644 (file)
@@ -17,7 +17,7 @@ Justification: CLA not signed
  xcode_pch(kqoauth all)
 --- a/thirdparty/kQOAuth/kqoauthutils.cpp
 +++ b/thirdparty/kQOAuth/kqoauthutils.cpp
-@@ -24,11 +24,6 @@
+@@ -24,10 +24,6 @@
  #include <QtDebug>
  #include "kqoauthutils.h"
  
@@ -25,7 +25,6 @@ Justification: CLA not signed
 -#include <openssl/err.h>
 -#include <openssl/ssl.h>
 -#include <openssl/evp.h>
--
  
  QString KQOAuthUtils::hmac_sha1(const QString &message, const QString &key)
- {
index 3e66f72..85f0b49 100644 (file)
@@ -5,6 +5,8 @@ Description: changes needed for MuseScore to build with Qt 5.12 (Alpha)
  preview), the other needed for MSVC and MinGW.
  Neither seems to cause issues with Qt 5.9 (like AppVeyor and Travis CI
  prove)
+Forwarded: not-needed
+Justification: for 2.x only, which upstream no longer supports
 
 --- a/mscore/editstringdata.cpp
 +++ b/mscore/editstringdata.cpp
index f27309c..3889c0f 100644 (file)
@@ -12,12 +12,12 @@ upstream/better-batch-convert.diff
 upstream/new-manpage.diff
 upstream/mtest-fix-freetype-includes.diff
 upstream/note-accessibleInfo-const.diff
+upstream/file-dialogues.diff
 upstream/update-AppData.diff
 debian-specific/fixup-AppData.diff
 experiments/upstream-backend-fixes.diff
 experiments/lyrics-hyphen-max-8sp.diff
 experiments/musescore-2.1.0-qt-5.12.patch
-experiments/file-dialogues.diff
 experiments/statusline-concert-transposing-pitch.diff
 experiments/element-barbeat.diff
 experiments/revert-restriking-patch.diff
index d9cc570..6af04c7 100644 (file)
@@ -2,7 +2,7 @@ Description: Overhaul -j to make it more flexible
  (plus some backports)
 Author: mirabilos <m@mirbsd.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/4166
-Applied-Upstream: master, commit:66dba74
+Applied-Upstream: master, commit:66dba74, v3.1
 
 --- a/mscore/file.cpp
 +++ b/mscore/file.cpp
index 533f98d..9759ac3 100644 (file)
@@ -1,6 +1,6 @@
 Description: Draw the first and last hyphen closer to the syllable
 Author: mirabilos <m@mirbsd.org>
-Applied-Upstream: master, commit:2c78cd4
+Applied-Upstream: master, commit:2c78cd4, v3.0
 
 --- a/libmscore/lyrics.cpp
 +++ b/libmscore/lyrics.cpp
index 907b03d..192f1a1 100644 (file)
@@ -1,7 +1,7 @@
 Description: Save //ChordList/font/sym in a sorted way
 Author: mirabilos <m@mirbsd.org>
 Bug: https://musescore.org/en/node/275849
-Applied-Upstream: master, commit:1bd9e454a
+Applied-Upstream: master, commit:1bd9e454a, v3.0
 
 --- a/libmscore/chordlist.h
 +++ b/libmscore/chordlist.h
index 1066814..2a3fee9 100644 (file)
@@ -1,7 +1,7 @@
 Description: Use system includes also for mtest
 Author: mirabilos <tg@debian.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/4143
-Applied-Upstream: master, commit:5d889d7f3
+Applied-Upstream: master, commit:5d889d7f3, v3.1
 
 --- a/mtest/CMakeLists.txt
 +++ b/mtest/CMakeLists.txt
index 897df93..ca9b4b1 100644 (file)
@@ -3,7 +3,7 @@ Description: fix #277903: new manpage
 Author: mirabilos <tg@debian.org>
 Bug: https://musescore.org/en/node/277903
 Forwarded: https://github.com/musescore/MuseScore/pull/4265
-Applied-Upstream: master, commit:e292cfb527
+Applied-Upstream: master, commit:e292cfb527, v3.1
 
 --- a/build/Linux+BSD/mscore.1.in
 +++ b/build/Linux+BSD/mscore.1.in
index 48864b6..fda11b9 100644 (file)
@@ -4,7 +4,7 @@ Description: Save locale-dependent preferences on program start
  start, letting users not find their scores.
  Noticed by Natureshadow <dominik.george@teckids.org>
 Author: mirabilos <tg@debian.org>
-Applied-Upstream: master, commit:b4b2d1281
+Applied-Upstream: master, commit:b4b2d1281, v3.0
 
 --- a/mscore/preferences.cpp
 +++ b/mscore/preferences.cpp
index a0992fa..a487951 100644 (file)
@@ -1,7 +1,7 @@
 Description: Log vtest comparison in machine-parsable format
 Author: mirabilos <tg@debian.org>
 Forwarded: https://github.com/musescore/MuseScore/pull/4648
-Applied-Upstream: master, commit:9275e77
+Applied-Upstream: master, commit:9275e77, v3.0.3
 
 --- a/vtest/gen
 +++ b/vtest/gen
index 63775ef..0fc8f94 100644 (file)
@@ -13,7 +13,7 @@ Description: Update AppData
 Author: Juraj Fiala <jurf@riseup.net>
 Forwarded: https://github.com/musescore/MuseScore/pull/4070
 Last-Update: 2019-05-02
-Applied-Upstream: master, commit:7d6270e47
+Applied-Upstream: master, commit:7d6270e47, v3.1
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt