[SCM] supercollider/master: Use gbp-pq for patches

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1a1c25ca07858840d33c652abc888e6aa898c9d7
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Nov 16 18:40:56 2016 -0300

    Use gbp-pq for patches

diff --git a/debian/patches/cmake-fix-systemboost.patch b/debian/patches/cmake-fix-systemboost.patch
index acc57b2..3b317ca 100644
--- a/debian/patches/cmake-fix-systemboost.patch
+++ b/debian/patches/cmake-fix-systemboost.patch
@@ -1,10 +1,18 @@
+From: Dan Stowell <danstowell at users.sourceforge.net>
+Date: Wed, 16 Nov 2016 18:33:12 -0300
+Subject: Fix ftbfs when using system boost
+
+Upstreamed, patch can be removed from 3.7.1+
 Forwarded: yes
-Description: Upstreamed, patch can be removed from 3.7.1+
-Index: supercollider/external_libraries/CMakeLists.txt
-===================================================================
---- supercollider.orig/external_libraries/CMakeLists.txt
-+++ supercollider/external_libraries/CMakeLists.txt
-@@ -60,6 +60,9 @@ if(NOT Boost_FOUND) # we compile boost o
+---
+ external_libraries/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/external_libraries/CMakeLists.txt b/external_libraries/CMakeLists.txt
+index 5cb123d..9d2555d 100644
+--- a/external_libraries/CMakeLists.txt
++++ b/external_libraries/CMakeLists.txt
+@@ -60,6 +60,9 @@ if(NOT Boost_FOUND) # we compile boost ourselves
  		set_property(TARGET boost_thread
  			APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
  	endif()
diff --git a/debian/patches/gcc5-compile-fix.patch b/debian/patches/gcc5-compile-fix.patch
index 553cc81..e165fea 100644
--- a/debian/patches/gcc5-compile-fix.patch
+++ b/debian/patches/gcc5-compile-fix.patch
@@ -1,15 +1,16 @@
-From f08184651bfcdb4c3129d4ed006ebbe76ce0e2a5 Mon Sep 17 00:00:00 2001
 From: Tim Blechmann <tim at klingt.org>
 Date: Sun, 6 Sep 2015 10:12:46 +0200
-Subject: [PATCH] supernova: gcc-5 compile fix
+Subject: supernova: gcc-5 compile fix
 
 ---
  server/supernova/CMakeLists.txt | 4 ++++
  1 file changed, 4 insertions(+)
 
+diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
+index 5ff5dd9..1ef4eda 100644
 --- a/server/supernova/CMakeLists.txt
 +++ b/server/supernova/CMakeLists.txt
-@@ -167,6 +167,10 @@
+@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
      endif()
  endif()
  
diff --git a/debian/patches/perf-counter-include.patch b/debian/patches/perf-counter-include.patch
index ca43f61..2874bd0 100644
--- a/debian/patches/perf-counter-include.patch
+++ b/debian/patches/perf-counter-include.patch
@@ -1,7 +1,17 @@
-Author: Dan Stowell <danstowell at users.sourceforge.net>
-Description: ia64 and alpha include perf bits in other files
-  Upstreamed, patch can be removed from 3.7.1+
+From: Dan Stowell <danstowell at users.sourceforge.net>
+Date: Wed, 16 Nov 2016 18:33:12 -0300
+Subject: Avoid FTBFS in ia64
+
+ia64 and alpha include perf bits in other files
+Upstreamed, patch can be removed from 3.7.1+
+
 Forwarded: yes
+---
+ external_libraries/nova-simd/benchmarks/perf_counter.hpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/external_libraries/nova-simd/benchmarks/perf_counter.hpp b/external_libraries/nova-simd/benchmarks/perf_counter.hpp
+index ee78f18..ee68df6 100644
 --- a/external_libraries/nova-simd/benchmarks/perf_counter.hpp
 +++ b/external_libraries/nova-simd/benchmarks/perf_counter.hpp
 @@ -54,6 +54,11 @@
diff --git a/debian/patches/supernova-i686-march-flag.patch b/debian/patches/supernova-i686-march-flag.patch
index e6af2a0..d950c17 100644
--- a/debian/patches/supernova-i686-march-flag.patch
+++ b/debian/patches/supernova-i686-march-flag.patch
@@ -1,6 +1,16 @@
+From: Dan Stowell <danstowell at users.sourceforge.net>
+Date: Wed, 16 Nov 2016 18:33:12 -0300
+Subject: Fix supernova build on x86
+
+---
+ server/supernova/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/server/supernova/CMakeLists.txt b/server/supernova/CMakeLists.txt
+index 35405b1..5ff5dd9 100644
 --- a/server/supernova/CMakeLists.txt
 +++ b/server/supernova/CMakeLists.txt
-@@ -157,6 +157,10 @@
+@@ -157,6 +157,10 @@ else()
      target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options boost_thread)
  endif()
  
diff --git a/debian/patches/tlsf-fPIC-flag.patch b/debian/patches/tlsf-fPIC-flag.patch
index ba4bc24..b0c4bf0 100644
--- a/debian/patches/tlsf-fPIC-flag.patch
+++ b/debian/patches/tlsf-fPIC-flag.patch
@@ -1,9 +1,20 @@
+From: Dan Stowell <danstowell at users.sourceforge.net>
+Date: Wed, 16 Nov 2016 18:33:12 -0300
+Subject: Add -fPIC flag to tlfs
+
+This patch (modified) was accepted upstream, and will be superfluous in
+SC 3.7.2 and later
+
 Forwarded: yes
-Description: enable tlsf library to build
- This patch (modified) was accepted upstream, and will be superfluous in SC 3.7.2 and later
+---
+ external_libraries/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/external_libraries/CMakeLists.txt b/external_libraries/CMakeLists.txt
+index 9d2555d..5dd0fe1 100644
 --- a/external_libraries/CMakeLists.txt
 +++ b/external_libraries/CMakeLists.txt
-@@ -69,6 +69,7 @@
+@@ -69,6 +69,7 @@ endif()
  add_library(tlsf STATIC "TLSF-2.4.6/src/tlsf.c")
  target_compile_definitions( tlsf PRIVATE TLSF_STATISTIC=1 )
  target_include_directories( tlsf INTERFACE TLSF-2.4.6/src )

-- 
supercollider packaging