[SCM] jack-audio-connection-kit/master: Move from CDBS to debhlper with the dh sequencer

Wed Nov 8 16:45:57 UTC 2017

The following commit has been merged in the master branch:
commit 4722b1333d81a9de07401ae3b2171d8ea06141bc
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Nov 8 16:56:10 2017 +0100

    Move from CDBS to debhlper with the dh sequencer
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

diff --git a/debian/control b/debian/control
index 701b705..e3f2972 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>,
 	Jonas Smedegaard <dr at jones.dk>,
 	Junichi Uekawa <dancer at debian.org>,
 	Reinhard Tartler <siretart at tauware.de>
-Build-Depends: cdbs (>= 0.4.93~),
+Build-Depends:
  libtool,
  automake,
  autoconf,
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index c4dd34c..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,106 +0,0 @@
-Source: jack-audio-connection-kit
-Section: sound
-Priority: optional
-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>,
-	Free Ekanayaka <freee at debian.org>,
-	Jonas Smedegaard <dr at jones.dk>,
-	Junichi Uekawa <dancer at debian.org>,
-	Reinhard Tartler <siretart at tauware.de>
-Build-Depends: @cdbs@,
- d-shlibs,
- doxygen,
- libasound2-dev [linux-any],
- libffado-dev (>= 2.0.0) [linux-any],
- libraw1394-dev [linux-any],
- libzita-resampler-dev [linux-any],
- libzita-alsa-pcmi-dev [linux-any],
- libreadline-dev,
- libsamplerate-dev,
- libsndfile1-dev,
- libtool,
- libdb-dev,
- uuid-dev,
- patchutils,
- po-debconf
-Standards-Version: 3.9.8
-Homepage: http://jackaudio.org/
-Vcs-Git: git://git.debian.org/git/pkg-multimedia/jack-audio-connection-kit.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/jack-audio-connection-kit.git;a=summary
-
-Package: jackd1
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends: coreutils (>= 4.0),
-	debconf | debconf-2.0,
-	libjack0 (= ${binary:Version}),
-	${misc:Depends},
-	${shlibs:Depends}
-Provides: jack-daemon
-Replaces: libjack0 (<< 1:0.118+svn3796-4),
-	jack-daemon,
-	jackd (<< 3)
-Conflicts: jack-daemon,
-	jackd (<< 3)
-Recommends: jackd1-firewire [amd64 i386 powerpc],
-	libpam-modules,
-	qjackctl
-Suggests: jack-tools,
-	meterbridge
-Description: JACK Audio Connection Kit (server and example clients)
- JACK is a low-latency sound server, allowing multiple applications to
- connect to one audio device, and to share audio between themselves.
- .
- This package contains the daemon jackd as well as some example clients.
-
-Package: libjack0
-Architecture: any
-Multi-Arch: same
-Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-	${shlibs:Depends}
-Conflicts: jackd1 (<< ${binary:Version}),
-	jackd1 (>> ${binary:Version}),
-	libjack-0.116,
-	libjack-0.125
-Suggests: jackd1 (= ${binary:Version})
-Provides: libjack-0.116, libjack-0.125
-Replaces: libjack-0.116, libjack-0.125
-Description: JACK Audio Connection Kit (libraries)
- JACK is a low-latency sound server, allowing multiple applications to
- connect to one audio device, and to share audio between themselves.
- .
- This package contains the shared libraries.
-
-Package: jackd1-firewire
-Architecture: amd64 i386 powerpc
-Provides: jackd-firewire
-Replaces: jackd-firewire
-Conflicts: jackd-firewire
-Depends: jackd1 (= ${binary:Version}),
-	${misc:Depends},
-	${shlibs:Depends}
-Description: JACK Audio Connection Kit (FFADO backend)
- JACK is a low-latency sound server, allowing multiple applications to
- connect to one audio device, and to share audio between themselves.
- .
- This package contains the IEEE1394 (FireWire) backend (FFADO).
-
-Package: libjack-dev
-Architecture: any
-Section: libdevel
-Depends: ${devlibs:Depends},
-	libjack0 (= ${binary:Version}),
-	${misc:Depends},
-	pkg-config,
-	uuid-dev,
-	${shlibs:Depends}
-Provides: libjack0.100.0-dev,
- libjack-dev-session
-Description: JACK Audio Connection Kit (development files)
- JACK is a low-latency sound server, allowing multiple applications to
- connect to one audio device, and to share audio between themselves.
- .
- This package contains files needed for the development of JACK applications
- and an API reference.
diff --git a/debian/jackd1-firewire.docs b/debian/jackd1-firewire.docs
new file mode 100644
index 0000000..ca0272a
--- /dev/null
+++ b/debian/jackd1-firewire.docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff --git a/debian/jackd1.docs b/debian/jackd1.docs
index 8ce5b40..ca0272a 100644
--- a/debian/jackd1.docs
+++ b/debian/jackd1.docs
@@ -1,2 +1,3 @@
-build-tree/jack-audio-connection-kit-*/TODO
-build-tree/jack-audio-connection-kit-*/AUTHORS
+AUTHORS
+README
+TODO
diff --git a/debian/jackd1.shlibs b/debian/jackd1.shlibs
new file mode 100644
index 0000000..9e2ef45
--- /dev/null
+++ b/debian/jackd1.shlibs
@@ -0,0 +1 @@
+libjackserver 0 jackd1 (>= 1:0.125.0)
diff --git a/debian/libjack-dev.docs b/debian/libjack-dev.docs
index 10d17f5..ca0272a 100644
--- a/debian/libjack-dev.docs
+++ b/debian/libjack-dev.docs
@@ -1,3 +1,3 @@
-build-tree/jack-audio-connection-kit-*/README
-build-tree/jack-audio-connection-kit-*/TODO
-build-tree/jack-audio-connection-kit-*/AUTHORS
+AUTHORS
+README
+TODO
diff --git a/debian/libjack0.docs b/debian/libjack0.docs
index 10d17f5..ca0272a 100644
--- a/debian/libjack0.docs
+++ b/debian/libjack0.docs
@@ -1,3 +1,3 @@
-build-tree/jack-audio-connection-kit-*/README
-build-tree/jack-audio-connection-kit-*/TODO
-build-tree/jack-audio-connection-kit-*/AUTHORS
+AUTHORS
+README
+TODO
diff --git a/debian/rules b/debian/rules
index eb7afbf..10617ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,13 @@
 #!/usr/bin/make -f
 
-DEB_AUTO_UPDATE_LIBTOOL = pre
-DEB_AUTO_UPDATE_AUTOCONF = 2.69
-DEB_AUTO_UPDATE_AUTOHEADER = 2.69
-DEB_AUTO_UPDATE_ACLOCAL = 1.15
-DEB_AUTO_UPDATE_AUTOMAKE = 1.15
-
 ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
 export DH_OPTIONS = -Njackd1-firewire
 endif
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
--include /usr/share/cdbs/1/rules/upstream-tarball.mk
--include /usr/share/cdbs/1/rules/utils.mk
-
-# Silence optional build-dependencies to ease backporting
-CDBS_BUILD_DEPENDS_rules_upstream-tarball =
-CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
-
-# Explicitly require these versions until cdbs knows about multiarch
-CDBS_BUILD_DEPENDS += , cdbs (>= 0.4.93~)
-CDBS_BUILD_DEPENDS += , bash-completion,
-CDBS_BUILD_DEPENDS_rules_debhelper_buildinfo =
-
 DEB_UPSTREAM_PACKAGE = jack-audio-connection-kit
 DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/\+.*//
 DEB_UPSTREAM_URL = http://jackaudio.org/downloads
 
-#unused, TODO get this soname from configure.in
-#DEB_SONAME_VERSION := 0.91.1-0
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-resize \
 	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	--enable-timestamps --disable-iec61883 --with-oldtrans \
@@ -72,19 +50,13 @@ endif
 DEB_DH_MAKESHLIBS_ARGS := -V -Xintime -Xinprocess -Xjack_alsa -Xjack_oss\
 	-Xjack_dummy -Xjack_iec61883 -Xjack_firewire
 
-# bootstrap autotools files (CDBS normally only updates them)
-DEB_MAKE_CLEAN_TARGET = distclean
-DEB_AUTOMAKE_ARGS = --add-missing --copy
-pre-build::
-	touch aclocal.m4
-clean::
-	find -name Makefile.in -exec rm {} +
-	rm -rf m4
 
-# Install bash completion. Drop this line once CDBS supports
-# dh_bash-completion.
-install/jackd1::
-	dh_bash-completion -pjackd1
+%:
+	dh $@ --parallel --with bash-completion -Sautoconf
+
+override_dh_auto_configure:
+	./autogen.sh
+	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
 
 .PHONY: faq
 # this target fetches the FAQ from the JACK homepage

-- 
Debian packaging for jack-audio-connection-kit

