[SCM] ecasound/master: Do not override dh_install for python-ecasound (use *.install file instead)

ghedo at users.alioth.debian.org ghedo at users.alioth.debian.org
Wed May 23 10:54:58 UTC 2012


The following commit has been merged in the master branch:
commit 4226a4bd4ae3ebdf8d87216becbf994102785af6
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Wed May 23 11:47:17 2012 +0200

    Do not override dh_install for python-ecasound (use *.install file instead)

diff --git a/debian/python-ecasound.install b/debian/python-ecasound.install
new file mode 100644
index 0000000..3e3efff
--- /dev/null
+++ b/debian/python-ecasound.install
@@ -0,0 +1 @@
+usr/lib/python*/*/*.py usr/share/pyshared/
diff --git a/debian/rules b/debian/rules
index f619f44..d837c01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,18 @@
 #!/usr/bin/make -f
 
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+CONFIGURE_FLAGS = --enable-pyecasound=python
+
 ifneq ($(DEB_HOST_ARCH_OS),linux)
-CONFIGURE_EXTRA_FLAGS += --disable-alsa
+	CONFIGURE_FLAGS += --disable-alsa
 endif
 
 %:
 	dh $@ --parallel --with=autotools-dev,python2
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-		--enable-pyecasound=python \
-		$(CONFIGURE_EXTRA_FLAGS)
+	dh_auto_configure -- $(CONFIGURE_FLAGS)
 
 override_dh_auto_build:
 	dh_auto_build
@@ -35,14 +36,6 @@ ifneq (,$(findstring ruby-ecasound, $(shell dh_listpackages)))
 	chmod a-x debian/ruby-ecasound/usr/lib/ruby/vendor_ruby/ecasound.rb
 endif
 
-override_dh_install:
-ifneq (,$(findstring python-ecasound, $(shell dh_listpackages)))
-	dh_install -ppython-ecasound \
-		usr/lib/python$(shell pyversions -dv)/*/*.py \
-			usr/share/pyshared/
-endif
-	dh_install --remaining-packages
-
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 

-- 
ecasound packaging



More information about the pkg-multimedia-commits mailing list