[SCM] qjackctl/master: Switch to short dh.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sun Dec 17 14:47:34 UTC 2017


The following commit has been merged in the master branch:
commit b1f373bca66172ff7c4b80bb8c53b69188a18f65
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Dec 17 15:42:01 2017 +0100

    Switch to short dh.

diff --git a/debian/control b/debian/control
index 8ab05d2..4856b37 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Uploaders:
  Jaromír Mikeš <mira.mikes at seznam.cz>,
  Free Ekanayaka <freee at debian.org>
 Build-Depends:
- cdbs,
- debhelper (>= 10),
+ debhelper (>= 10~),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libjack-dev,
  qtbase5-dev,
@@ -26,8 +25,6 @@ Depends:
  jackd,
  ${misc:Depends},
  ${shlibs:Depends}
-Recommends:
- ${dist:Recommends}
 Suggests:
  pulseaudio-utils
 Description: User interface for controlling the JACK sound server
diff --git a/debian/rules b/debian/rules
index 7336d54..dfa433b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,16 @@
 #!/usr/bin/make -f
 
-CFLAGS = -Wall -g
-export QTDIR=/usr/share/qt5
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-export QT_SELECT=qt5
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+export QT_SELECT=qt5
 
-ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
-	DEB_DH_GENCONTROL_ARGS_qjackctl = -- -Vdist:Recommends="pulseaudio-utils"
-else
-	DEB_DH_GENCONTROL_ARGS_qjackctl = -- -Vdist:Recommends=""
-endif
+%:
+	dh $@
 
-DEB_MAKE_CLEAN_TARGET   := clean
-DEB_CLEAN_EXCLUDE       := qjackctl.pro
+override_dh_clean:
+	dh_clean --exclude=qjackctl.pro
 
-cleanbuilddir::
-	rm -rf src/.moc/ src/.obj/ src/.ui/
-	rm -rf src/config.h src/src.pri src/translations/*.qm
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-debug

-- 
qjackctl packaging



More information about the pkg-multimedia-commits mailing list