[SCM] libgroove/master: Use gbp-pq for patch handling
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Wed Jan 4 00:37:47 UTC 2017
The following commit has been merged in the master branch:
commit cb6ce8c4a5551260749fb0fc0f7520e72da92fdd
Author: Felipe Sateler <fsateler at debian.org>
Date: Tue Jan 3 21:10:08 2017 -0300
Use gbp-pq for patch handling
diff --git a/debian/patches/gnu-install-dirs.patch b/debian/patches/gnu-install-dirs.patch
index ab23ae2..30efea8 100644
--- a/debian/patches/gnu-install-dirs.patch
+++ b/debian/patches/gnu-install-dirs.patch
@@ -1,7 +1,14 @@
From: Andrew Kelley <superjoe30 at gmail.com>
-Subject: Use GNUInstallDirs to determine install locations
- GNUInstallDirs is available as of cmake 2.8.5.
-Forwarded: https://github.com/andrewrk/libgroove/commit/14481a0978389a677150a7c530bbe6b7dc69e9bf
+Date: Tue, 3 Jan 2017 21:04:34 -0300
+Subject: Use GNUInstallDirs to determine install locations GNUInstallDirs is
+ available as of cmake 2.8.5.
+
+---
+ CMakeLists.txt | 25 +++++++++++++------------
+ 1 file changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a1e8541..be89a90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ endif()
@@ -12,7 +19,7 @@ Forwarded: https://github.com/andrewrk/libgroove/commit/14481a0978389a677150a7c5
set(LIBGROOVE_STATUS "yes")
set(LIBGROOVE_VERSION_MAJOR 4)
-@@ -166,15 +167,15 @@ add_library(groove_static STATIC ${LIBGR
+@@ -166,15 +167,15 @@ add_library(groove_static STATIC ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS})
set_target_properties(groove_static PROPERTIES
OUTPUT_NAME groove
COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")
diff --git a/debian/patches/no-Werror.patch b/debian/patches/no-Werror.patch
index 8acb413..7165775 100644
--- a/debian/patches/no-Werror.patch
+++ b/debian/patches/no-Werror.patch
@@ -1,9 +1,16 @@
-Description: remove Werror
- It is harmful in distributions as it causes unnecessary build failures.
+From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Date: Tue, 3 Jan 2017 21:04:34 -0300
+Subject: cmake: remove Werror
+
+It is harmful in distributions as it causes unnecessary build failures.
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Last-Update: <2015-01-09>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be89a90..cec002e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,8 +136,8 @@ configure_file (
--
libgroove packaging
More information about the pkg-multimedia-commits
mailing list