[SCM] Audacity debian packaging branch, master, updated. debian/1.3.12-2-10-g2646e45

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

The following commit has been merged in the master branch:
commit 66b84e160397beab2902ef087105bd077cfa3f5a
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Tue Jun 29 18:55:59 2010 +0200

    Switch from CDBS to dh 7.

diff --git a/debian/control b/debian/control
index fcea392..90a5904 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,7 @@ Uploaders: Free Ekanayaka <freee at debian.org>,
            David Henningsson <diwic at ubuntu.com>
 Standards-Version: 3.8.4
 Build-Depends: autotools-dev,
-               cdbs (>= 0.4.4),
-               debhelper (>= 7),
+               debhelper (>= 7.0.50~),
                gettext,
                libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libavcodec-dev (>= 3:0.svn20090204),
diff --git a/debian/rules b/debian/rules
index bd43b6b..b2ac4fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
 # only enable jack on i386 and powerpc (See #406754)
 ifeq (i386,$(DEB_HOST_ARCH))
 WITH_JACK_CONFFLAG := --with-jack=yes
@@ -41,6 +37,10 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 # Do not link against unused libraries (make dpkg-shlibdeps happy).
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-common-install-impl::
+%:
+	dh --parallel $@
+
+override_dh_auto_install:
+	dh_auto_install
 	# Don't package unnecessary copy of GPL
 	rm -f debian/tmp/usr/share/doc/audacity/LICENSE.txt

-- 
Audacity debian packaging