[SCM] Audacity debian packaging branch, master, updated. upstream/1.3.6-41-ga9ee8e9

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

The following commit has been merged in the master branch:
commit a9ee8e936e0a61272ae1215fca4b3d905b20c6db
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Tue Jan 20 15:49:39 2009 +0100

    Remove the redundant LICENSE.txt file immediately after the install rule. Do not manually remove lib-src/libpormixer.a in the clean rule. We build --without-portmixer anyway.

diff --git a/debian/NEWS b/debian/NEWS
index 5e5db84..be5b68a 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-audacity (1.3.6-3) UNRELEASED; urgency=low
+audacity (1.3.6-3) unstable; urgency=low
 
   * Explicitely built against the system libsamplerate, effectively disabling
     the internal libresample. This may break support for proprietary VST
diff --git a/debian/audacity-data.install b/debian/audacity-data.install
index 3c72677..fd7d9ad 100644
--- a/debian/audacity-data.install
+++ b/debian/audacity-data.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/share
-debian/audacity.xpm usr/share/pixmaps
-debian/audacity16.xpm usr/share/pixmaps
+debian/tmp/usr/share/audacity
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/mime
 debian/gnome-mime-application-x-audacity-project.xpm usr/share/pixmaps
diff --git a/debian/audacity.install b/debian/audacity.install
index 451ddc0..be1f851 100644
--- a/debian/audacity.install
+++ b/debian/audacity.install
@@ -1 +1,6 @@
 debian/tmp/usr/bin
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/doc
+debian/tmp/usr/share/man
+debian/audacity.xpm usr/share/pixmaps
+debian/audacity16.xpm usr/share/pixmaps
diff --git a/debian/changelog b/debian/changelog
index 82681a1..0a44e96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-audacity (1.3.6-3) UNRELEASED; urgency=low
+audacity (1.3.6-3) unstable; urgency=low
 
   * Added myself to Uploaders.
   * Wrapped Uploaders and Build-Depends fields.
@@ -28,11 +28,14 @@ audacity (1.3.6-3) UNRELEASED; urgency=low
   * Reordered configure flags in debian/rules and renamed
     T1_DEB_CONFIGURE_EXTRA_FLAGS to the more descriptive WITH_JACK_CONFFLAG.
   * Audacity suggests libmp3lame0.
-  * Added an arch:all audacity-data package that contains the architecture-
-    independent content of '/usr/share'.
+  * Added an arch:all audacity-data package that contains most of the
+    architecture-independent content of the '/usr/share' directory.
   * Fixed faulty confflags --with-libid3tag and --with-libvorbis.
+  * Remove the redundant LICENSE.txt file immediately after the install rule.
+  * Do not manually remove lib-src/libpormixer.a in the clean rule. We build
+    --without-portmixer anyway.
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Tue, 20 Jan 2009 14:00:00 +0100
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Tue, 20 Jan 2009 15:45:00 +0100
 
 audacity (1.3.6-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index e88c548..400278a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,18 +27,16 @@ DEB_CONFIGURE_EXTRA_FLAGS := $(WITH_JACK_CONFFLAG) \
                              --with-libid3tag=system \
                              --with-libmad=system \
                              --with-libsamplerate=system \
+                             --without-libresample \
                              --with-libsndfile=system \
                              --with-libtwolame=system \
                              --with-libvorbis=system \
-                             --without-portmixer \
                              --with-portaudio=v19 \
+                             --without-portmixer \
                              --with-soundtouch=system
 
 DEB_COMPRESS_EXCLUDE := *.htb
 
-binary-post-install/audacity-data::
+common-install-impl::
 	# Don't package unnecessary copy of GPL
-	rm -f debian/audacity-data/usr/share/doc/audacity-data/LICENSE.txt
-
-clean::
-	rm -f lib-src/libpormixer.a
+	rm -f debian/tmp/usr/share/doc/audacity/LICENSE.txt

-- 
Audacity debian packaging