[SCM] stk/master: Use gbp pq for patch handling

Sat Jul 23 15:40:38 UTC 2016

The following commit has been merged in the master branch:
commit 8cce8450996e761eb68ed19cb1a45655bb9cde3a
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sat Jul 23 10:43:42 2016 -0400

    Use gbp pq for patch handling

diff --git a/debian/patches/0001-Bump-soname-with-each-release.patch b/debian/patches/Bump-soname-with-each-release.patch
similarity index 100%
rename from debian/patches/0001-Bump-soname-with-each-release.patch
rename to debian/patches/Bump-soname-with-each-release.patch
diff --git a/debian/patches/0004-File-endian.h-is-not-on-machine-subdir.patch b/debian/patches/File-endian.h-is-not-on-machine-subdir.patch
similarity index 100%
rename from debian/patches/0004-File-endian.h-is-not-on-machine-subdir.patch
rename to debian/patches/File-endian.h-is-not-on-machine-subdir.patch
diff --git a/debian/patches/0007-Finish-renaming-SKINI.patch b/debian/patches/Finish-renaming-SKINI.patch
similarity index 98%
rename from debian/patches/0007-Finish-renaming-SKINI.patch
rename to debian/patches/Finish-renaming-SKINI.patch
index 94ceb94..5341db1 100644
--- a/debian/patches/0007-Finish-renaming-SKINI.patch
+++ b/debian/patches/Finish-renaming-SKINI.patch
@@ -1,8 +1,7 @@
-From a2be4bc72149ccdb3f29d4f7093f0bb4669ef0a6 Mon Sep 17 00:00:00 2001
 From: Stephen Sinclair <radarsat1 at gmail.com>
 Date: Thu, 7 Aug 2014 11:53:21 +0200
-Subject: [PATCH] Finish renaming SKINI.msg and SKINI.tbl to SKINImsg.h and
- SKINItbl.h, respectively.
+Subject: Finish renaming SKINI.msg and SKINI.tbl to SKINImsg.h and SKINItbl.h,
+ respectively.
 
 ---
  doc/SKINI.txt                    | 22 +++++++++++-----------
diff --git a/debian/patches/0005-Fix-install-target-for-new-soname-scheme.patch b/debian/patches/Fix-install-target-for-new-soname-scheme.patch
similarity index 100%
rename from debian/patches/0005-Fix-install-target-for-new-soname-scheme.patch
rename to debian/patches/Fix-install-target-for-new-soname-scheme.patch
diff --git a/debian/patches/0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch b/debian/patches/Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
similarity index 100%
rename from debian/patches/0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
rename to debian/patches/Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
diff --git a/debian/patches/0002-Rename-demo-to-stk-demo.patch b/debian/patches/Rename-demo-to-stk-demo.patch
similarity index 100%
rename from debian/patches/0002-Rename-demo-to-stk-demo.patch
rename to debian/patches/Rename-demo-to-stk-demo.patch
diff --git a/debian/patches/0008-Sort-o-files b/debian/patches/Sort-o-files
similarity index 73%
rename from debian/patches/0008-Sort-o-files
rename to debian/patches/Sort-o-files
index 4db9880..1ca86aa 100644
--- a/debian/patches/0008-Sort-o-files
+++ b/debian/patches/Sort-o-files
@@ -1,19 +1,21 @@
-Description: Sort *.o files
- Fix the order in which *.o files are merged to build the shared lib,
- to get reproducible build.
-Author: Alexis Bienvenüe <pado at passoire.fr>
+From: =?utf-8?q?Alexis_Bienven=C3=BCe?= <pado at passoire.fr>
+Date: Sat, 23 Jul 2016 10:38:18 -0400
+Subject: Fix order of .o files
 
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -90,7 +90,7 @@ $(STATICLIB) : $(OBJECTS)
- 
- $(SHAREDLIB) : $(OBJECTS)
- 	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
--	$(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
-+	$(CC) $(LDFLAGS) -fPIC @libflags@ `LC_ALL=C ls $(OBJECT_PATH)/*.o` $(LIBS)
- 	$(LN) -s @sharedname@ $(SHAREDLIB)
- 
- install-headers:
+Allows the build to be reproducible
+
+Closes: #822566
+---
+ projects/demo/Makefile.in      | 2 +-
+ projects/effects/Makefile.in   | 2 +-
+ projects/eguitar/Makefile.in   | 2 +-
+ projects/examples/Makefile.in  | 2 +-
+ projects/ragamatic/Makefile.in | 2 +-
+ src/Makefile.in                | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/projects/demo/Makefile.in b/projects/demo/Makefile.in
+index 1ec932d..c8a1469 100644
 --- a/projects/demo/Makefile.in
 +++ b/projects/demo/Makefile.in
 @@ -63,7 +63,7 @@ $(OBJECT_PATH)/.placeholder:
@@ -25,6 +27,8 @@ Author: Alexis Bienvenüe <pado at passoire.fr>
  
  libdemo: demo.cpp
  	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
+diff --git a/projects/effects/Makefile.in b/projects/effects/Makefile.in
+index 0fd65a2..98606ab 100644
 --- a/projects/effects/Makefile.in
 +++ b/projects/effects/Makefile.in
 @@ -52,7 +52,7 @@ $(OBJECT_PATH)/.placeholder:
@@ -36,6 +40,8 @@ Author: Alexis Bienvenüe <pado at passoire.fr>
  
  libeffects: effects.cpp
  	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o effects effects.cpp -L../../src -lstk $(LIBRARY)
+diff --git a/projects/eguitar/Makefile.in b/projects/eguitar/Makefile.in
+index 806e4b2..f794e0a 100644
 --- a/projects/eguitar/Makefile.in
 +++ b/projects/eguitar/Makefile.in
 @@ -52,7 +52,7 @@ $(OBJECT_PATH)/.placeholder:
@@ -47,6 +53,8 @@ Author: Alexis Bienvenüe <pado at passoire.fr>
  
  libeguitar: eguitar.cpp
  	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o eguitar utilities.cpp eguitar.cpp -L../../src -lstk $(LIBRARY)
+diff --git a/projects/examples/Makefile.in b/projects/examples/Makefile.in
+index aa102c9..e2787ec 100644
 --- a/projects/examples/Makefile.in
 +++ b/projects/examples/Makefile.in
 @@ -57,7 +57,7 @@ strip :
@@ -58,6 +66,8 @@ Author: Alexis Bienvenüe <pado at passoire.fr>
  
  midiprobe:
  	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp $(LIBRARY) -lrtmidi
+diff --git a/projects/ragamatic/Makefile.in b/projects/ragamatic/Makefile.in
+index 6426909..24a5500 100644
 --- a/projects/ragamatic/Makefile.in
 +++ b/projects/ragamatic/Makefile.in
 @@ -53,7 +53,7 @@ $(OBJECT_PATH)/.placeholder:
@@ -69,3 +79,16 @@ Author: Alexis Bienvenüe <pado at passoire.fr>
  
  libragamat: ragamat.cpp Tabla.cpp Drone.cpp VoicDrum.cpp
  	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o ragamat Tabla.cpp Drone.cpp VoicDrum.cpp ragamat.cpp -L../../src -lstk $(LIBRARY)
+diff --git a/src/Makefile.in b/src/Makefile.in
+index df82595..223be7c 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -90,7 +90,7 @@ $(STATICLIB) : $(OBJECTS)
+ 
+ $(SHAREDLIB) : $(OBJECTS)
+ 	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+-	$(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
++	$(CC) $(LDFLAGS) -fPIC @libflags@ `LC_ALL=C ls $(OBJECT_PATH)/*.o` $(LIBS)
+ 	$(LN) -s @sharedname@ $(SHAREDLIB)
+ 
+ install-headers:
diff --git a/debian/patches/0007-demo-needs-rt.patch b/debian/patches/demo-needs-rt.patch
similarity index 76%
rename from debian/patches/0007-demo-needs-rt.patch
rename to debian/patches/demo-needs-rt.patch
index 6aaeb32..1462d87 100644
--- a/debian/patches/0007-demo-needs-rt.patch
+++ b/debian/patches/demo-needs-rt.patch
@@ -1,3 +1,14 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Sat, 23 Jul 2016 10:39:51 -0400
+Subject: Only build demo program when realtime is enabled
+
+Closes: #815509
+---
+ Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5afd13e..94eedd9 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -6,8 +6,8 @@ REALTIME = @realtime@
diff --git a/debian/patches/series b/debian/patches/series
index d0f0fc4..bb872b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-0001-Bump-soname-with-each-release.patch
-0002-Rename-demo-to-stk-demo.patch
-0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
-0004-File-endian.h-is-not-on-machine-subdir.patch
-0005-Fix-install-target-for-new-soname-scheme.patch
-0007-Finish-renaming-SKINI.patch
-0007-demo-needs-rt.patch
-0008-Sort-o-files
+Bump-soname-with-each-release.patch
+Rename-demo-to-stk-demo.patch
+Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
+File-endian.h-is-not-on-machine-subdir.patch
+Fix-install-target-for-new-soname-scheme.patch
+Finish-renaming-SKINI.patch
+demo-needs-rt.patch
+Sort-o-files

-- 
stk packaging

