[SCM] musescore/master: Update debian files after upstream release
shoogle-guest at users.alioth.debian.org
shoogle-guest at users.alioth.debian.org
Sat Jun 18 10:27:19 UTC 2016
The following commit has been merged in the master branch:
commit d630682e74359a53951dc17c3033eaea3e9ce11b
Author: Peter Jonas <pjonas56 at gmail.com>
Date: Sat Jun 18 10:19:00 2016 +0100
Update debian files after upstream release
- upstream installs manpage and aliases (musescore vs mscore)
- upstream disables rpath (removed chrpath from dependencies)
- upstream disables icon cache update via Makefile option
- removed obsolete patches (Closes: #815688; LP: #1492629)
- new dependency qml-module-qtquick-dialogs needed for plugins
diff --git a/debian/changelog b/debian/changelog
index 19d5a9c..dc1e112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+musescore (2.0.3+dfsg1-1) UNRELEASED; urgency=medium
+
+ * New upstream version 2.0.3
+ * Closes: #798289, #802705, #823160; LP: #1487695, #1503714.
+ * Removed obsolete patches (Closes: #815688; LP: #1492629)
+ * Update debian/copyright (Closes: #818619)
+ * Set revision on upstream import via uscan (Closes: #818795; LP: #1492623)
+ * Update syntax for debian/gbp.conf and debian/watch
+ * Add Files-Excluded field to debian/copyright and adjusted debian/repack
+
+ -- Peter Jonas <pjonas56 at gmail.com> Sat, 18 Jun 2016 07:34:30 +0100
+
musescore (2.0.2+dfsg-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index b92e98a..1f5a5f4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), cmake, qtbase5-dev,
qtquick1-5-dev, qtscript5-dev, libqt5xmlpatterns5-dev,
libqt5svg5-dev, libqt5webkit5-dev, libasound2-dev, libjack-dev,
libpulse-dev, libsndfile1-dev (>= 1.0.18), libmp3lame-dev,
- portaudio19-dev, zlib1g-dev, libfreetype6-dev, chrpath
+ portaudio19-dev, zlib1g-dev, libfreetype6-dev
Standards-Version: 3.9.6
Homepage: http://www.musescore.org/
Vcs-Git: git://anonscm.debian.org/pkg-multimedia/musescore.git
@@ -19,9 +19,9 @@ Architecture: any
Provides: mscore
Replaces: mscore (<< 0.9.6+dfsg-1)
Breaks: mscore (<< 0.9.6+dfsg-1)
-Depends: ${misc:Depends}, ${shlibs:Depends}, libqt5sql5-sqlite,
- qml-module-qtquick2, qml-module-qtquick-controls, qml-module-qtquick-layouts,
- musescore-common (>= 2.0), xdg-utils, desktop-file-utils, shared-mime-info
+Depends: ${misc:Depends}, ${shlibs:Depends}, libqt5sql5-sqlite, qml-module-qtquick2,
+ qml-module-qtquick-controls, qml-module-qtquick-layouts, qml-module-qtquick-dialogs,
+ musescore-common (>= 2.0.3), xdg-utils, desktop-file-utils, shared-mime-info
Recommends: pulseaudio-utils
Suggests: timgm6mb-soundfont, fluid-soundfont-gm
Description: Free music composition and notation software
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index 322e211..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-build/mscore.1
-build/musescore.1
-
diff --git a/debian/musescore.links b/debian/musescore.links
deleted file mode 100644
index 448861e..0000000
--- a/debian/musescore.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/mscore usr/bin/musescore
diff --git a/debian/patches/01-do-not-install-manual-pdf.patch b/debian/patches/01-do-not-install-manual-pdf.patch
deleted file mode 100644
index 0897069..0000000
--- a/debian/patches/01-do-not-install-manual-pdf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Description: Don't install PDF manual as it is removed for DFSG compliance
-# Author: Toby Smithe <tsmithe at ubuntu.com>
-
---- a/share/CMakeLists.txt
-+++ b/share/CMakeLists.txt
-@@ -18,7 +18,7 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- #=============================================================================
-
--subdirs(templates wallpaper locale styles sound manual
-+subdirs(templates wallpaper locale styles sound #manual
- workspaces instruments)
-
- install (DIRECTORY
diff --git a/debian/patches/02-do-not-update-mime-during-build.patch b/debian/patches/02-do-not-update-mime-during-build.patch
deleted file mode 100644
index 5699796..0000000
--- a/debian/patches/02-do-not-update-mime-during-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -96,27 +96,19 @@
-
- install: release
- cd build.release \
-- && make install/strip \
-- && update-mime-database "${PREFIX}/share/mime" \
-- && gtk-update-icon-cache -f -t "${PREFIX}/share/icons/hicolor"
-+ && make install/strip
-
- installdebug: debug
- cd build.debug \
-- && make install \
-- && update-mime-database "${PREFIX}/share/mime" \
-- && gtk-update-icon-cache -f -t "${PREFIX}/share/icons/hicolor"
-+ && make install
-
- uninstall:
- cd build.release \
-- && xargs rm < install_manifest.txt \
-- && update-mime-database "${PREFIX}/share/mime" \
-- && gtk-update-icon-cache -f -t "${PREFIX}/share/icons/hicolor"
-+ && xargs rm < install_manifest.txt
-
- uninstalldebug:
- cd build.debug \
-- && xargs rm < install_manifest.txt \
-- && update-mime-database "${PREFIX}/share/mime" \
-- && gtk-update-icon-cache -f -t "${PREFIX}/share/icons/hicolor"
-+ && xargs rm < install_manifest.txt
-
- #
- # linux
diff --git a/debian/patches/03-fix-when-char-defaults-to-unsigned.patch b/debian/patches/03-fix-when-char-defaults-to-unsigned.patch
deleted file mode 100644
index 038f4d3..0000000
--- a/debian/patches/03-fix-when-char-defaults-to-unsigned.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: fix for arm, where char by default is unsigned
-Origin: upstream,
- https://github.com/musescore/MuseScore/commit/78605d6aefe45f44
-Bug-Debian: https://bugs.debian.org/802705
-Last-Update: 2015-10-23
-
-diff --git a/libmscore/clef.h b/libmscore/clef.h
-index 2e0b157..00161fa 100644
---- a/libmscore/clef.h
-+++ b/libmscore/clef.h
-@@ -92,7 +92,7 @@ class ClefInfo {
- int _line; ///< Line for musicXml.
- int _octChng; ///< Octave change for musicXml.
- int _pitchOffset; ///< Pitch offset for line 0.
-- char _lines[14];
-+ signed char _lines[14];
- const char* _name;
- StaffGroup _staffGroup;
-
-@@ -102,7 +102,7 @@ class ClefInfo {
- static int line(ClefType t) { return clefTable[int(t)]._line; }
- static int octChng(ClefType t) { return clefTable[int(t)]._octChng; }
- static int pitchOffset(ClefType t) { return clefTable[int(t)]._pitchOffset; }
-- static const char* lines(ClefType t) { return clefTable[int(t)]._lines; }
-+ static const signed char* lines(ClefType t) { return clefTable[int(t)]._lines; }
- static const char* name(ClefType t) { return clefTable[int(t)]._name; }
- static StaffGroup staffGroup(ClefType t) { return clefTable[int(t)]._staffGroup; }
- static ClefType tag2type(const QString&);
-diff --git a/libmscore/keysig.cpp b/libmscore/keysig.cpp
-index 3a51b03..778e95f 100644
---- a/libmscore/keysig.cpp
-+++ b/libmscore/keysig.cpp
-@@ -180,7 +180,7 @@ void KeySig::layout()
- // naturals should go AFTER accidentals if they should not go before!
- bool suffixNaturals = naturalsOn && !prefixNaturals;
-
-- const char* lines = ClefInfo::lines(clef);
-+ const signed char* lines = ClefInfo::lines(clef);
-
- // add prefixed naturals, if any
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 25c0c86..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-do-not-install-manual-pdf.patch
-02-do-not-update-mime-during-build.patch
-03-fix-when-char-defaults-to-unsigned.patch
diff --git a/debian/rules b/debian/rules
index 4476fee..bb837a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,12 @@ override_dh_auto_clean:
-rm -f build/musescore.1
override_dh_auto_install:
- DEB_BUILD_HARDENING=1 $(MAKE) PREFIX=/usr DESTDIR=$(CURDIR)/debian/musescore install
- cp build/mscore.1 build/musescore.1
+ DEB_BUILD_HARDENING=1 $(MAKE) \
+ PREFIX=/usr \
+ DESTDIR=$(CURDIR)/debian/musescore \
+ UPDATE_CACHE="FALSE" \
+ NO_RPATH="TRUE" \
+ install
override_dh_install:
dh_install
@@ -27,7 +31,6 @@ override_dh_install:
-mv $(CURDIR)/debian/musescore/usr/share/mscore* $(CURDIR)/debian/musescore-common/usr/share/
-rm -r $(CURDIR)/debian/musescore/usr/share/mscore*
cd $(CURDIR)/debian/musescore-common/usr/share && ln -s mscore-* mscore
- chrpath -d $(CURDIR)/debian/musescore/usr/bin/mscore
.PHONY: get-orig-source
## Usage: debian/rules get-orig-source
--
musescore packaging
More information about the pkg-multimedia-commits
mailing list