[SCM] mixxx/master: Minimize delta between Debian and Ubuntu: introduce new SUBSTVAR in debian/control and pass it to dh_gencontrol to set different deps depending on the distribution.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Nov 11 13:14:24 UTC 2010


The following commit has been merged in the master branch:
commit b75c750e3dc0a9d3ef7e74ef5b2533ca7b165d50
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Nov 11 14:11:41 2010 +0100

    Minimize delta between Debian and Ubuntu: introduce new SUBSTVAR in debian/control and pass it to dh_gencontrol to set different deps depending on the distribution.

diff --git a/debian/control b/debian/control
index 549fb0f..d384c96 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
  mixxx-data (= ${source:Version}),
  libqt4-sql-sqlite,
+ ${dist:Depends},
  ${misc:Depends}
 Suggests: pdf-viewer
 Description: Digital Disc Jockey Interface
diff --git a/debian/rules b/debian/rules
index c4d354f..ea1e3fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,12 @@ DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname
 UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
 PACKAGE = mixxx
 
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+	SUBSTVARS = -Vdist:Depends="pulseaudio-utils"
+else
+	SUBSTVARS = -Vdist:Depends=""
+endif
+
 %:
 	dh $@
 
@@ -29,3 +35,6 @@ override_dh_auto_install:
 		-exec rm -f {} \;
 	find $(CURDIR)/debian/tmp -name '*.js' -exec chmod -x {} \;
 	find $(CURDIR)/debian/tmp/usr/share/mixxx/ -type f -exec chmod -x {} \;
+
+override_dh_gencontrol:
+	dh_gencontrol -- $(SUBSTVARS)

-- 
mixxx packaging



More information about the pkg-multimedia-commits mailing list