[SCM] Audacity debian packaging branch, master, updated. debian/1.3.7-2-7-g27f9de1

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Sun Jun 14 14:28:37 UTC 2009


The following commit has been merged in the master branch:
commit 27f9de19078fa52a714a55b1063aec98a3a3084a
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Sun Jun 14 16:28:28 2009 +0200

    Update make-distclean.patch to also remove lib-src/libportmixer.a.

diff --git a/debian/changelog b/debian/changelog
index ff96015..de2cb3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ audacity (1.3.7-3) UNRELEASED; urgency=low
     + Update my e-mail address.
     + Move audacity-dbg to section debug.
   * Bumped Standards-Version to 3.8.1.
+  * Update make-distclean.patch to also remove lib-src/libportmixer.a.
 
- -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 14 Jun 2009 14:41:01 +0200
+ -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 14 Jun 2009 16:26:36 +0200
 
 audacity (1.3.7-2) unstable; urgency=low
 
diff --git a/debian/patches/make-distclean.patch b/debian/patches/make-distclean.patch
index 254bb6b..184579e 100644
--- a/debian/patches/make-distclean.patch
+++ b/debian/patches/make-distclean.patch
@@ -1,25 +1,25 @@
-diff -Nurp debian.git/lib-src/libnyquist/Makefile.in audacity-1.3.7/lib-src/libnyquist/Makefile.in
---- debian.git/lib-src/libnyquist/Makefile.in	2009-02-03 11:20:23.000000000 +0100
-+++ audacity-1.3.7/lib-src/libnyquist/Makefile.in	2009-02-03 20:28:23.000000000 +0100
-@@ -520,4 +520,5 @@ cleaner: clean
+diff -Nur -x '*.orig' -x '*~' debian.git/lib-src/libnyquist/Makefile.in debian.git.new/lib-src/libnyquist/Makefile.in
+--- debian.git/lib-src/libnyquist/Makefile.in	2009-06-14 15:40:18.000000000 +0200
++++ debian.git.new/lib-src/libnyquist/Makefile.in	2009-06-14 15:41:54.803169276 +0200
+@@ -520,4 +520,5 @@
  	rm -f points.dat
  
  distclean: cleaner
 +	-$(MAKE) -C misc distclean
  	rm -f Makefile
-diff -Nurp debian.git/lib-src/libnyquist/misc/Makefile.in audacity-1.3.7/lib-src/libnyquist/misc/Makefile.in
---- debian.git/lib-src/libnyquist/misc/Makefile.in	2009-02-03 13:03:56.000000000 +0100
-+++ audacity-1.3.7/lib-src/libnyquist/misc/Makefile.in	2009-02-03 19:51:37.000000000 +0100
-@@ -65,3 +65,5 @@ cleaner: clean
+diff -Nur -x '*.orig' -x '*~' debian.git/lib-src/libnyquist/misc/Makefile.in debian.git.new/lib-src/libnyquist/misc/Makefile.in
+--- debian.git/lib-src/libnyquist/misc/Makefile.in	2009-06-14 15:40:18.000000000 +0200
++++ debian.git.new/lib-src/libnyquist/misc/Makefile.in	2009-06-14 15:41:54.803169276 +0200
+@@ -65,3 +65,5 @@
  	rm -f *.BAK
  	rm -f *~
  
 +distclean: cleaner
 +	rm -f Makefile
-diff -Nurp debian.git/lib-src/libvamp/Makefile.in audacity-1.3.7/lib-src/libvamp/Makefile.in
---- debian.git/lib-src/libvamp/Makefile.in	2009-02-03 13:03:56.000000000 +0100
-+++ audacity-1.3.7/lib-src/libvamp/Makefile.in	2009-02-03 19:45:18.000000000 +0100
-@@ -248,7 +248,7 @@ clean:		
+diff -Nur -x '*.orig' -x '*~' debian.git/lib-src/libvamp/Makefile.in debian.git.new/lib-src/libvamp/Makefile.in
+--- debian.git/lib-src/libvamp/Makefile.in	2009-06-14 15:40:18.000000000 +0200
++++ debian.git.new/lib-src/libvamp/Makefile.in	2009-06-14 15:41:54.803169276 +0200
+@@ -248,7 +248,7 @@
  		rm -f $(SDK_OBJECTS) $(HOSTSDK_OBJECTS) $(PLUGIN_OBJECTS) $(HOST_OBJECTS) $(RDFGEN_OBJECTS)
  
  distclean:	clean
@@ -28,10 +28,10 @@ diff -Nurp debian.git/lib-src/libvamp/Makefile.in audacity-1.3.7/lib-src/libvamp
  
  install:	$(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET)
  		mkdir -p $(DESTDIR)$(INSTALL_API_HEADERS)
-diff -Nurp debian.git/lib-src/lib-widget-extra/Makefile.in audacity-1.3.7/lib-src/lib-widget-extra/Makefile.in
---- debian.git/lib-src/lib-widget-extra/Makefile.in	2009-02-03 11:20:23.000000000 +0100
-+++ audacity-1.3.7/lib-src/lib-widget-extra/Makefile.in	2009-02-03 19:43:44.000000000 +0100
-@@ -82,6 +82,9 @@ clean:
+diff -Nur -x '*.orig' -x '*~' debian.git/lib-src/lib-widget-extra/Makefile.in debian.git.new/lib-src/lib-widget-extra/Makefile.in
+--- debian.git/lib-src/lib-widget-extra/Makefile.in	2009-06-14 15:40:18.000000000 +0200
++++ debian.git.new/lib-src/lib-widget-extra/Makefile.in	2009-06-14 15:41:54.803169276 +0200
+@@ -82,6 +82,9 @@
  	rm -rf $(OBJS)
  	rm -f $(LIBFILE) $(EXTRAS)
  
@@ -41,3 +41,14 @@ diff -Nurp debian.git/lib-src/lib-widget-extra/Makefile.in audacity-1.3.7/lib-sr
  #
  # Rule for compiling C++ files
  #
+diff -Nur -x '*.orig' -x '*~' debian.git/lib-src/Makefile.in debian.git.new/lib-src/Makefile.in
+--- debian.git/lib-src/Makefile.in	2009-02-03 13:03:56.000000000 +0100
++++ debian.git.new/lib-src/Makefile.in	2009-06-14 15:43:09.287169573 +0200
+@@ -222,6 +222,7 @@
+ 	-$(MAKE) -C soundtouch distclean
+ 	-$(MAKE) -C twolame distclean
+ 	-rm -f @LOCAL_LIBS@
++	-rm -f libportmixer.a
+ 
+ # list here all the targets that aren't actually files to be made
+ .PHONY: portSMF eexpat-recursive FileDialog-recursive \

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list