[SCM] sooperlooper/master: Refresh patches.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Wed Dec 7 10:36:33 UTC 2011
The following commit has been merged in the master branch:
commit d6c47c2bc05522d980018c32100e28a7c14598f4
Author: Alessio Treglia <alessio at debian.org>
Date: Wed Dec 7 11:36:28 2011 +0100
Refresh patches.
diff --git a/debian/patches/01-spelling_error.patch b/debian/patches/01-spelling_error.patch
index 4037d9d..a3c3a42 100644
--- a/debian/patches/01-spelling_error.patch
+++ b/debian/patches/01-spelling_error.patch
@@ -4,8 +4,8 @@ Description: Fix spelling error.
src/gui/keyboard_target.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- sooperlooper-1.6.14.orig/src/gui/keyboard_target.cpp
-+++ sooperlooper-1.6.14/src/gui/keyboard_target.cpp
+--- sooperlooper.orig/src/gui/keyboard_target.cpp
++++ sooperlooper/src/gui/keyboard_target.cpp
@@ -408,7 +408,7 @@ KeyboardTarget::load_bindings (const XML
action = (*niter)->property ("action");
diff --git a/debian/patches/02-remove_dmalloc.patch b/debian/patches/02-remove_dmalloc.patch
index 59a0656..c858806 100644
--- a/debian/patches/02-remove_dmalloc.patch
+++ b/debian/patches/02-remove_dmalloc.patch
@@ -17,7 +17,7 @@ Description: Don't compile dmalloc and don't link it against GPL-stuff.
pathscanner.cc \
--- sooperlooper.orig/libs/pbd/Makefile.in
+++ sooperlooper/libs/pbd/Makefile.in
-@@ -58,7 +58,7 @@ ARFLAGS = cru
+@@ -54,7 +54,7 @@ ARFLAGS = cru
libpbd_a_AR = $(AR) $(ARFLAGS)
libpbd_a_LIBADD =
am_libpbd_a_OBJECTS = basename.$(OBJEXT) dirname.$(OBJEXT) \
@@ -26,7 +26,7 @@ Description: Don't compile dmalloc and don't link it against GPL-stuff.
pathscanner.$(OBJEXT) pool.$(OBJEXT) pthread_utils.$(OBJEXT) \
receiver.$(OBJEXT) textreceiver.$(OBJEXT) \
transmitter.$(OBJEXT) undo.$(OBJEXT) unescape.$(OBJEXT) \
-@@ -210,7 +210,6 @@ noinst_LIBRARIES = libpbd.a
+@@ -215,7 +215,6 @@ noinst_LIBRARIES = libpbd.a
libpbd_a_SOURCES = \
basename.cc \
dirname.cc \
@@ -34,7 +34,7 @@ Description: Don't compile dmalloc and don't link it against GPL-stuff.
ftw.cc \
mountpoint.cc \
pathscanner.cc \
-@@ -301,7 +300,6 @@ distclean-compile:
+@@ -306,7 +305,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/basename.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dirname.Po at am__quote@
diff --git a/debian/patches/03-indirect_linking.patch b/debian/patches/03-indirect_linking.patch
index 9b415e0..72048f3 100644
--- a/debian/patches/03-indirect_linking.patch
+++ b/debian/patches/03-indirect_linking.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632253
--- sooperlooper.orig/src/gui/Makefile.in
+++ sooperlooper/src/gui/Makefile.in
-@@ -118,7 +118,7 @@ JACK_CFLAGS = @JACK_CFLAGS@
+@@ -113,7 +113,7 @@ JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
--
sooperlooper packaging
More information about the pkg-multimedia-commits
mailing list