[SCM] sooperlooper packaging branch, master, updated. debian/1.6.14-1-4-ge6ba187

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 20fa17af596b184ed0b9452588fd16b89cc576a4
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Tue Mar 23 16:18:02 2010 +0100

    debian/patches/02-remove_dmalloc.patch: Don't compile and don't link against dmalloc.cc module, it's unnecessary.

diff --git a/debian/patches/02-remove_dmalloc.patch b/debian/patches/02-remove_dmalloc.patch
new file mode 100644
index 0000000..59a0656
--- /dev/null
+++ b/debian/patches/02-remove_dmalloc.patch
@@ -0,0 +1,44 @@
+Author: Alessio Treglia <quadrispro at ubuntu.com>
+Description: Don't compile dmalloc and don't link it against GPL-stuff.
+---
+ libs/pbd/Makefile.am |    1 -
+ libs/pbd/Makefile.in |    4 +---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+--- sooperlooper.orig/libs/pbd/Makefile.am
++++ sooperlooper/libs/pbd/Makefile.am
+@@ -12,7 +12,6 @@ noinst_LIBRARIES    = libpbd.a
+ libpbd_a_SOURCES = \
+      basename.cc \
+      dirname.cc \
+-     dmalloc.cc \
+ 	 ftw.cc \
+      mountpoint.cc \
+      pathscanner.cc \
+--- sooperlooper.orig/libs/pbd/Makefile.in
++++ sooperlooper/libs/pbd/Makefile.in
+@@ -58,7 +58,7 @@ ARFLAGS = cru
+ libpbd_a_AR = $(AR) $(ARFLAGS)
+ libpbd_a_LIBADD =
+ am_libpbd_a_OBJECTS = basename.$(OBJEXT) dirname.$(OBJEXT) \
+-	dmalloc.$(OBJEXT) ftw.$(OBJEXT) mountpoint.$(OBJEXT) \
++	ftw.$(OBJEXT) mountpoint.$(OBJEXT) \
+ 	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
+ libpbd_a_SOURCES = \
+      basename.cc \
+      dirname.cc \
+-     dmalloc.cc \
+ 	 ftw.cc \
+      mountpoint.cc \
+      pathscanner.cc \
+@@ -301,7 +300,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@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dmalloc.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ftw.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mountpoint.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pathscanner.Po at am__quote@
diff --git a/debian/patches/series b/debian/patches/series
index 5f74bd6..ce4f3ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-spelling_error.patch
+02-remove_dmalloc.patch

-- 
sooperlooper packaging