[SCM] musescore/master: New patch: 02-do-not-update-mime-during-build.patch
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Sun Jul 19 00:26:50 UTC 2015
The following commit has been merged in the master branch:
commit f78c7b251812001fdf3a21f874b291efa5709d16
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Sat Jul 18 00:22:03 2015 -0400
New patch: 02-do-not-update-mime-during-build.patch
diff --git a/debian/changelog b/debian/changelog
index 560e8d9..d11c1b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ musescore (2.0.2+dfsg-1) unstable; urgency=medium
* New upstream version 2.0.2
* Remove Debian patch related to multi-processors, fixed by upstream.
* Build-depend on shared-mime-info
+ * New patch: 02-do-not-update-mime-during-build.patch
- -- Tiago Bortoletto Vaz <tiago at debian.org> Fri, 17 Jul 2015 10:07:50 -0400
+ -- Tiago Bortoletto Vaz <tiago at debian.org> Sat, 18 Jul 2015 00:21:32 -0400
musescore (2.0.1+dfsg-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c590081..8ea4b55 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, shared-mime-info
+ portaudio19-dev, zlib1g-dev, libfreetype6-dev, chrpath
Standards-Version: 3.9.6
Homepage: http://www.musescore.org/
Vcs-Git: git://anonscm.debian.org/pkg-multimedia/musescore.git
@@ -21,7 +21,7 @@ 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
+ musescore-common (>= 2.0), 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/musescore.postinst b/debian/musescore.postinst
index 1fbc319..1e5b64e 100644
--- a/debian/musescore.postinst
+++ b/debian/musescore.postinst
@@ -1,14 +1,14 @@
#!/bin/sh
set -e
-#xdg-icon-resource install --noupdate --context mimetypes --size 64 /usr/share/pixmaps/mscore.png application-x-musescore
-#xdg-icon-resource install --noupdate --context mimetypes --size 64 /usr/share/pixmaps/mscore.png application-x-musescore+xml
-
xdg-icon-resource forceupdate
-#xdg-mime default /usr/share/applications/mscore.desktop application/x-musescore
-#xdg-mime default /usr/share/applications/mscore.desktop application/x-musescore+xml
+if [ -x "`which update-desktop-database 2>/dev/null`" ] ; then
+ update-desktop-database /usr/share/applications
+fi
-update-desktop-database /usr/share/applications
+if [ -x /usr/bin/update-mime-database ]; then
+ update-mime-database /usr/share/mime
+fi
#DEBHELPER#
diff --git a/debian/musescore.postrm b/debian/musescore.postrm
index 98a2f5f..f410fd1 100644
--- a/debian/musescore.postrm
+++ b/debian/musescore.postrm
@@ -5,4 +5,8 @@ if [ -x "`which update-desktop-database 2>/dev/null`" ] ; then
update-desktop-database /usr/share/applications
fi
+if [ -x /usr/bin/update-mime-database ]; then
+ update-mime-database /usr/share/mime
+fi
+
#DEBHELPER#
diff --git a/debian/musescore.prerm b/debian/musescore.prerm
index b140f17..20db445 100644
--- a/debian/musescore.prerm
+++ b/debian/musescore.prerm
@@ -1,9 +1,6 @@
#!/bin/sh
set -e
-#xdg-icon-resource uninstall --context mimetypes --size 64 application-x-musescore
-#xdg-icon-resource uninstall --context mimetypes --size 64 application-x-musescore+xml
-
xdg-icon-resource forceupdate
#DEBHELPER#
diff --git a/debian/patches/28-do-not-install-manual-pdf.patch b/debian/patches/01-do-not-install-manual-pdf.patch
similarity index 100%
rename from debian/patches/28-do-not-install-manual-pdf.patch
rename to debian/patches/01-do-not-install-manual-pdf.patch
diff --git a/debian/patches/02-do-not-update-mime-during-build.patch b/debian/patches/02-do-not-update-mime-during-build.patch
new file mode 100644
index 0000000..5699796
--- /dev/null
+++ b/debian/patches/02-do-not-update-mime-during-build.patch
@@ -0,0 +1,34 @@
+--- 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/08-disable-multiple-jobs.patch b/debian/patches/08-disable-multiple-jobs.patch
deleted file mode 100644
index 462593b..0000000
--- a/debian/patches/08-disable-multiple-jobs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Tobias Toedter <toddy at debian.org>
-Subject: Detect multiple CPUs better
- The current system of detecting multiple CPUs and using them for
- multiple jobs in parallel is not very robust and results in a FTBFS on
- some architectures.
-
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -37,7 +37,8 @@
- cmake -DCMAKE_BUILD_TYPE=RELEASE \
- -DCMAKE_INSTALL_PREFIX="${PREFIX}" ..; \
- make lrelease; \
-- make -j ${CPUS}; \
-+ make;
-+ #make -j ${CPUS}; \
-
-
- debug:
diff --git a/debian/patches/25-build-hurd.patch b/debian/patches/25-build-hurd.patch
deleted file mode 100644
index 3ebbe4a..0000000
--- a/debian/patches/25-build-hurd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# Description: Set build options for GNU/Hurd and kFreeBSD.
-# Author: Toby Smithe <tsmithe at ubuntu.com>
-
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -168,6 +168,17 @@
- musescorefonts-Free.qrc)
- endif (APPLE)
-
-+if (${CMAKE_SYSTEM} MATCHES "GNU-0.3")
-+ INCLUDE (Platform/GNU)
-+ set ( USE_ALSA 0 )
-+ set ( USE_PORTMIDI 0 )
-+endif (${CMAKE_SYSTEM} MATCHES "GNU-0.3")
-+
-+if (${CMAKE_SYSTEM} MATCHES "kFreeBSD")
-+ INCLUDE (Platform/kFreeBSD)
-+ set ( USE_ALSA 0 )
-+ set ( USE_PORTMIDI 0 )
-+endif (${CMAKE_SYSTEM} MATCHES "kFreeBSD")
-
- set (AUDIO "")
- if (MINGW)
diff --git a/debian/patches/27-makefile-binpath.patch b/debian/patches/27-makefile-binpath.patch
deleted file mode 100644
index b753487..0000000
--- a/debian/patches/27-makefile-binpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@
- #
- # change path to include your Qt5 installation
- #
--BINPATH = ${HOME}/Qt5/5.3/gcc_64/bin:${PATH}
-+BINPATH = ${PATH}
-
- release:
- if test ! -d build.release; then mkdir build.release; fi; \
diff --git a/debian/patches/series b/debian/patches/series
index 7eb497d..ffb4b0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,24 +1,2 @@
-# dropped 01-use-global-fluidsynth with 0.9.5b1869+dfsg-1
-# dropped 02-freedom with 0.9.6b2490
-# dropped 03-build-desktop-file with version 0.9.2+dfsg-1
-# dropped 04-use-fluid-soundfont with 0.9.6b2439
-# dropped 05-use-mscore-common-files.patch with version 2.0~beta1-1
-# dropped 06-build-documentation with version 0.9.2+dfsg-1
-# dropped 07-fix-xml-in-msc with version 0.9.3n~svn1071+dfsg-1
-# 08-disable-multiple-jobs.patch
-# dropped 09-disable-building-qtscript.patch with version 2.0~beta1-1
-# dropped 10-disable-awl.patch with version 2.0~beta1-1
-# dropped 11-install-manual with 0.9.5b1925+dfsg (REVERTED BELOW)
-# dropped 11-install-manual.patch with version 2.0~beta1-1
-# dropped 12-debianise-about-box.patch with version 2.0~beta1-1
-# dropped 15-add-mime-to-desktop-file with 0.9.5b1825+dfsg
-# dropped 16-ProcessHTML with 0.9.6b2421
-# 17-ProcessHTML-remove-ja.patch
-# dropped 18-correct-sf2-path.patch with version 2.0~beta1-1
-# dropped 21-fix-startup-notification.patch with version 2.0~beta1-1
-# dropped 23-fix-bindings.patch with version 2.0~beta1-1
-# dropped 25-desktop-file-genericnames.patch with version 2.0~beta1-1
-# dropped adjust-newer-freetype-header-location.patch with version 2.0~beta1-1
-# dropped 26-remove-nonfree-prelude.mscx-from-installation.patch with 2.0~beta1-1
-# dropped 27-makefile-binpath.patch
-28-do-not-install-manual-pdf.patch
+01-do-not-install-manual-pdf.patch
+02-do-not-update-mime-during-build.patch
--
musescore packaging
More information about the pkg-multimedia-commits
mailing list