[SCM] csound/master: Switch to gbp-pq

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Mon Nov 30 13:48:33 UTC 2015 

The following commit has been merged in the master branch:
commit 9a3d0dfd0619a0b8d31c04a90bc87c0df35250d8
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Nov 30 10:06:10 2015 -0300

    Switch to gbp-pq
    
    Mark all debian-specific patches as debian-specific topic.
    Do not use numbering.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7e38616..669c7f5 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,3 +2,7 @@
 
 [DEFAULT]
 pristine-tar = True
+
+[pq]
+patch-numbers = False
+
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
deleted file mode 100644
index 1dfce8c..0000000
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Avoid non-free scansyn plugin
- The scanned synthesis opcodes are not DFSG-free, so we delete them from
- the upstream sources. They need to be removed from SConstruct as well
- to prevent build failures. We don't remove them at the same time as the
- opcodes themselves to keep repacking of the source minimal.
-Author: Felipe Sateler <fsateler at gmail.com>
---- a/Opcodes/CMakeLists.txt
-+++ b/Opcodes/CMakeLists.txt
-@@ -101,10 +101,6 @@ if(BUILD_PLATEREV_OPCODES)
-    make_plugin(platerev platerev.c m)
- endif()
- 
--set(scansyn_SRCS
--    scansyn.c scansynx.c)
--make_plugin(scansyn "${scansyn_SRCS}" m)
--
- if(UNIX)
-     make_plugin(control control.c)
- endif()
diff --git a/debian/patches/0001-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch b/debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
similarity index 80%
rename from debian/patches/0001-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
rename to debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
index b0caa2d..1c21cab 100644
--- a/debian/patches/0001-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
+++ b/debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
@@ -1,7 +1,6 @@
-From e7d5030f53e016dd85c2f8fcd3c6607ca06404ed Mon Sep 17 00:00:00 2001
 From: Felipe Sateler <fsateler at debian.org>
 Date: Wed, 13 May 2015 21:43:09 -0300
-Subject: [PATCH] Do not pass a null pointer to strdup. Fixes #466
+Subject: Do not pass a null pointer to strdup. Fixes #466
 
 ---
  frontends/csladspa/csladspa.cpp | 4 +++-
@@ -22,6 +21,3 @@ index f6beff6..a37212c 100644
  #endif
  
    if (src) {
--- 
-2.1.4
-
diff --git a/debian/patches/README b/debian/patches/README
deleted file mode 100644
index 80c1584..0000000
--- a/debian/patches/README
+++ /dev/null
@@ -1,3 +0,0 @@
-0xxx: Grabbed from upstream development.
-1xxx: Possibly relevant for upstream adoption.
-2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/2007-apidoc-dotpath.patch b/debian/patches/debian-specific/apidoc-dotpath.patch
similarity index 63%
rename from debian/patches/2007-apidoc-dotpath.patch
rename to debian/patches/debian-specific/apidoc-dotpath.patch
index 2f5c318..ae7fe37 100644
--- a/debian/patches/2007-apidoc-dotpath.patch
+++ b/debian/patches/debian-specific/apidoc-dotpath.patch
@@ -1,5 +1,13 @@
-Description: Leave dotpath blank in doxygen config
-Author: Felipe Sateler <fsateler at gmail.com>
+From: Felipe Sateler <fsateler at gmail.com>
+Date: Mon, 30 Nov 2015 10:02:13 -0300
+Subject: Leave dotpath blank in doxygen config
+
+---
+ doc/Doxyfile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Doxyfile b/doc/Doxyfile
+index 83aa6ca..bd56156 100644
 --- a/doc/Doxyfile
 +++ b/doc/Doxyfile
 @@ -1807,7 +1807,7 @@ INTERACTIVE_SVG        = NO
diff --git a/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff b/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff
new file mode 100644
index 0000000..f60c3b4
--- /dev/null
+++ b/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff
@@ -0,0 +1,27 @@
+From: Felipe Sateler <fsateler at gmail.com>
+Date: Mon, 30 Nov 2015 10:02:13 -0300
+Subject: Avoid non-free scansyn plugin
+
+The scanned synthesis opcodes are not DFSG-free, so we delete them from
+the upstream sources. They need to be removed from SConstruct as well
+to prevent build failures. We don't remove them at the same time as the
+opcodes themselves to keep repacking of the source minimal.
+---
+ Opcodes/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt
+index 7aea9a1..85e8b57 100644
+--- a/Opcodes/CMakeLists.txt
++++ b/Opcodes/CMakeLists.txt
+@@ -101,10 +101,6 @@ if(BUILD_PLATEREV_OPCODES)
+    make_plugin(platerev platerev.c m)
+ endif()
+ 
+-set(scansyn_SRCS
+-    scansyn.c scansynx.c)
+-make_plugin(scansyn "${scansyn_SRCS}" m)
+-
+ if(UNIX)
+     make_plugin(control control.c)
+ endif()
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/debian-specific/lua-link.diff
similarity index 55%
rename from debian/patches/2001-lua-link.diff
rename to debian/patches/debian-specific/lua-link.diff
index 5766398..c87427d 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/debian-specific/lua-link.diff
@@ -1,11 +1,20 @@
-Description: Only link to lua when necessary, and to the correct lib
- Lua policy recommends not linking against the lua library, because it
- doesn't help at all. All lua-using programs will load the library, not
- the modules.
- TODO: The csound-lua bridge is not implemented in cmake yet.
- The csound-lua bridge, on the other hand, needs to link to the library or
- else it will fail to load. Use the correct library name.
-Author: Felipe Sateler <fsateler at gmail.com>
+From: Felipe Sateler <fsateler at gmail.com>
+Date: Mon, 30 Nov 2015 10:02:13 -0300
+Subject: Only link to lua when necessary, and to the correct lib
+
+Lua policy recommends not linking against the lua library, because it
+doesn't help at all. All lua-using programs will load the library, not
+the modules.
+TODO: The csound-lua bridge is not implemented in cmake yet.
+The csound-lua bridge, on the other hand, needs to link to the library or
+else it will fail to load. Use the correct library name.
+---
+ frontends/CsoundAC/CMakeLists.txt | 4 ++--
+ interfaces/CMakeLists.txt         | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/frontends/CsoundAC/CMakeLists.txt b/frontends/CsoundAC/CMakeLists.txt
+index dbf5bfb..54bd824 100644
 --- a/frontends/CsoundAC/CMakeLists.txt
 +++ b/frontends/CsoundAC/CMakeLists.txt
 @@ -152,10 +152,10 @@ if(BUILD_CSOUND_AC)
@@ -21,9 +30,11 @@ Author: Felipe Sateler <fsateler at gmail.com>
          endif()
  
  
+diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
+index ba813db..30896a3 100644
 --- a/interfaces/CMakeLists.txt
 +++ b/interfaces/CMakeLists.txt
-@@ -162,7 +162,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_
+@@ -162,7 +162,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
      endif()
  
      if(BUILD_LUA_INTERFACE)
diff --git a/debian/patches/series b/debian/patches/series
index 6448511..def6616 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0001-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
-2000-avoid-nonfree-scansyn-plugin.diff
-2001-lua-link.diff
-2007-apidoc-dotpath.patch
+Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
+debian-specific/avoid-nonfree-scansyn-plugin.diff
+debian-specific/lua-link.diff
+debian-specific/apidoc-dotpath.patch

-- 
csound packaging

More information about the pkg-multimedia-commits mailing list