[SCM] UNNAMED PROJECT branch, master, updated. debian/1.2-13-8-g9d4711d

[gregor herrmann]

The following commit has been merged in the master branch:
commit 13f4aa28f651a18366ded0d72e8aa6785a612728
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Mar 12 20:46:28 2013 +0100

    debian/{control,rules}: don't insert xulrunner dependency on Ubuntu and derivatives

diff --git a/debian/control b/debian/control
index 19e3307..6bdab10 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 7),
  libswt-gtk-3-java,
  libitext-java,
  libasound2-dev | liboss4-salsa-dev,
- libfluidsynth-dev
+ libfluidsynth-dev,
+ dpkg-dev (>= 1.15.1)
 Standards-Version: 3.9.3
 Homepage: http://www.tuxguitar.com.ar
 Vcs-Git: git://git.debian.org/git/pkg-java/tuxguitar.git
@@ -28,7 +29,7 @@ Depends: default-jre | java2-runtime,
  libswt-gtk-3-java,
  libswt-cairo-gtk-3-jni,
  libswt-webkit-gtk-3-jni,
- xulrunner-10.0 | xulrunner-9.0 | xulrunner-8.0 | xulrunner-7.0 | xulrunner-6.0 | xulrunner-5.0 | xulrunner-1.9.1,
+ ${xulrunner:Depends},
  ${misc:Depends}
 Recommends: tuxguitar-alsa (= ${source:Version}), tuxguitar-oss (= ${source:Version})
 Suggests: tuxguitar-jsa (= ${source:Version}), lilypond
diff --git a/debian/rules b/debian/rules
index 2625786..68e2853 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,12 @@ export JAVAC JAVA JAVA_HOME
 DEB_DESTDIR?=${CURDIR}/debian/${MAINPACKAGE}
 DEB_DESTDIR_TMP?=${CURDIR}/debian/tmp/${MAINPACKAGE}
 
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+	XULRUNNERDEPENDS = -Vxulrunner:Depends=""
+else
+	XULRUNNERDEPENDS = -Vxulrunner:Depends="xulrunner-10.0 | xulrunner-9.0 | xulrunner-8.0 | xulrunner-7.0 | xulrunner-6.0 | xulrunner-5.0 | xulrunner-1.9.1"
+endif
+
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
@@ -58,7 +64,7 @@ binary-common:
 	dh_fixperms
 	dh_shlibdeps
 	dh_installdeb
-	dh_gencontrol
+	dh_gencontrol -- $(XULRUNNERDEPENDS)
 	dh_md5sums
 	dh_builddeb
 

-- 
UNNAMED PROJECT