[SCM] libdrumstick/master: Refresh patches.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun Feb 5 20:15:29 UTC 2012
The following commit has been merged in the master branch:
commit 0886cb1368cc7f3a2c333eb9939cde741439b49a
Author: Alessio Treglia <alessio at debian.org>
Date: Sun Feb 5 20:54:33 2012 +0100
Refresh patches.
diff --git a/debian/patches/linker-gold.patch b/debian/patches/linker-gold.patch
index 778a6d8..ff39c10 100644
--- a/debian/patches/linker-gold.patch
+++ b/debian/patches/linker-gold.patch
@@ -1,6 +1,12 @@
---- a/utils/vpiano/CMakeLists.txt
-+++ b/utils/vpiano/CMakeLists.txt
-@@ -7,6 +7,8 @@
+Description: Fix FTBFS with GNU's gold ld.
+From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615742
+---
+ utils/vpiano/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- libdrumstick.orig/utils/vpiano/CMakeLists.txt
++++ libdrumstick/utils/vpiano/CMakeLists.txt
+@@ -7,6 +7,8 @@ SET(vpiano_forms_SRCS
QT4_WRAP_UI(vpiano_ui_SRCS ${vpiano_forms_SRCS})
@@ -9,7 +15,7 @@
SET(vpiano_SRCS
pianokey.cpp
pianokey.h
-@@ -52,7 +54,7 @@
+@@ -52,7 +54,7 @@ ADD_EXECUTABLE(drumstick-vpiano
TARGET_LINK_LIBRARIES(drumstick-vpiano
${QT_LIBRARIES}
${ALSA_LIBS}
diff --git a/debian/patches/no-lib-suffix.patch b/debian/patches/no-lib-suffix.patch
index 3022139..5822046 100644
--- a/debian/patches/no-lib-suffix.patch
+++ b/debian/patches/no-lib-suffix.patch
@@ -1,7 +1,12 @@
-Install in /usr/lib instead of /usr/lib64, even on 64-bit archs
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,11 +27,8 @@
+Description: Install in /usr/lib instead of /usr/lib64, even on 64-bit archs
+Origin: Debian
+---
+ CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+--- libdrumstick.orig/CMakeLists.txt
++++ libdrumstick/CMakeLists.txt
+@@ -27,11 +27,8 @@ IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
--
libdrumstick packaging
More information about the pkg-multimedia-commits
mailing list