[SCM] musescore/master: Remove patch for Hurd and KFreeBSB builds, it's in upstream code already.

tiago at users.alioth.debian.org tiago at users.alioth.debian.org
Mon Jun 22 21:31:24 UTC 2015


The following commit has been merged in the master branch:
commit 7b554582f6fde0ddd5c75f2d8eb7f784888e9a15
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Mon Jun 22 17:31:10 2015 -0400

    Remove patch for Hurd and KFreeBSB builds, it's in upstream code already.

diff --git a/debian/changelog b/debian/changelog
index 804e5cd..ca07e00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ musescore (2.0.1+dfsg-2) unstable; urgency=medium
 
   * Improve package short and long descriptions
   * Patch Makefile to avoid build error on m68k
+  * Remove patch for Hurd and KFreeBSB builds, it's in upstream code already.
 
  -- Tiago Bortoletto Vaz <tiago at debian.org>  Wed, 17 Jun 2015 15:58:47 -0400
 
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/series b/debian/patches/series
index f26b12b..0b6e2ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,6 @@
 # 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
-25-build-hurd.patch
 # 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

-- 
musescore packaging



More information about the pkg-multimedia-commits mailing list