begin making this a bit more orderly

diff --git a/debian/patches/fix-accidental-paren-pos.diff b/debian/patches/experiments/fix-accidental-paren-pos.diff
similarity index 100%
rename from debian/patches/fix-accidental-paren-pos.diff
rename to debian/patches/experiments/fix-accidental-paren-pos.diff

diff --git a/debian/patches/fontx.diff b/debian/patches/experiments/improve-mscore-font.diff
similarity index 100%
rename from debian/patches/fontx.diff
rename to debian/patches/experiments/improve-mscore-font.diff

diff --git a/debian/patches/series b/debian/patches/series
index 8f2e879..08ce8a5 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-fix-accidental-paren-pos.diff
-fontx.diff
 debian-specific/dfsg-exclusions.diff
 experiments/no-sql.diff
 debian-specific/debundle-openssl.diff
@@ -82,6 +80,8 @@ experiments/silence-qdebug.diff
 experiments/statusline-concert-transposing-pitch.diff
 experiments/element-barbeat.diff
 experiments/smufl-typo.diff
+experiments/fix-accidental-paren-pos.diff
+experiments/improve-mscore-font.diff
 experiments/revert-restriking-patch.diff
 experiments/log-collisions.diff
 #debian-specific/qt-5.7.diff

diff --git a/debian/rules b/debian/rules
index b63212a..4725697 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ endif
 CMAKE_DEFS+=   -DMSCORE_INSTALL_SUFFIX="3"
 
 override_dh_auto_configure:
-       cp -f debian/mscore.ttf fonts/mscore/mscore.ttf
+       cp -f debian/upstream/mscore.ttf fonts/mscore/mscore.ttf
        rm -rf debian/q-include
        mkdir debian/q-include
        printf '#define DEB_PKG_VERSION "%s (%s %s/%s)"\n' \

diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 1c4f1f6..688e146 100644 (file)
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1 @@
-debian/mscore.ttf
+debian/upstream/mscore.ttf

diff --git a/debian/mscore.ttf b/debian/upstream/mscore.ttf
similarity index 100%
rename from debian/mscore.ttf
rename to debian/upstream/mscore.ttf