[SCM] Audacity debian packaging branch, master, updated. upstream/1.3.6-36-g70a3b6b

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

The following commit has been merged in the master branch:
commit 70a3b6b105564c3af7f43b9952a2e22cb54b0e10
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Jan 19 16:49:14 2009 +0100

    Reordered configure flags in debian/rules and renamed T1_DEB_CONFIGURE_EXTRA_FLAGS to the more descriptive WITH_JACK_CONFFLAG.

diff --git a/debian/changelog b/debian/changelog
index eea5331..d2a2376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ audacity (1.3.6-3) UNRELEASED; urgency=low
     (Closes: #405623).
   * Explicitely built against the system libsamplerate, effectively disabling
     the internal libresample.
+    --> Note that this disables support for proprietary VST plugins!
+  * Reordered configure flags in debian/rules and renamed
+    T1_DEB_CONFIGURE_EXTRA_FLAGS to the more descriptive WITH_JACK_CONFFLAG.
 
  -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 19 Jan 2009 11:14:19 +0100
 
diff --git a/debian/rules b/debian/rules
index 9a1f17a..53915da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,32 +7,32 @@ include /usr/share/cdbs/1/rules/utils.mk
 
 # only enable jack on i386 and powerpc (See #406754)
 ifeq (i386,$(DEB_HOST_ARCH))
-T1_DEB_CONFIGURE_EXTRA_FLAGS := --with-jack=yes
+WITH_JACK_CONFFLAG := --with-jack=yes
 else
  ifeq (powerpc,$(DEB_HOST_ARCH))
-T1_DEB_CONFIGURE_EXTRA_FLAGS := --with-jack=yes
+WITH_JACK_CONFFLAG := --with-jack=yes
  else
   ifeq (amd64,$(DEB_HOST_ARCH))
-T1_DEB_CONFIGURE_EXTRA_FLAGS := --with-jack=yes
+WITH_JACK_CONFFLAG := --with-jack=yes
   else
-T1_DEB_CONFIGURE_EXTRA_FLAGS := --with-jack=no
+WITH_JACK_CONFFLAG := --with-jack=no
   endif
  endif
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS := $(T1_DEB_CONFIGURE_EXTRA_FLAGS) \
-                             --with-libsndfile=system \
+DEB_CONFIGURE_EXTRA_FLAGS := $(WITH_JACK_CONFFLAG) \
+                             --enable-unicode \
+                             --with-expat=system \
+                             --with-id3tag=system \
+                             --with-libflac=system \
+                             --with-libmad=system \
                              --with-libsamplerate=system \
-                             --with-vorbis=system \
-			     --with-id3tag=system \
+                             --with-libsndfile=system \
+                             --with-libtwolame=system \
+                             --with-portaudio=v19 \
+                             --without-portmixer \
                              --with-soundtouch=system \
-			     --with-libmad=system \
-			     --with-libflac=system \
-			     --with-libtwolame=system \
-			     --with-expat=system \
-			     --with-portaudio=v19 \
-			     --enable-unicode \
-			     --without-portmixer
+                             --with-vorbis=system
 
 DEB_COMPRESS_EXCLUDE := *.htb
 

-- 
Audacity debian packaging