Switched build-system to dh

diff --git a/debian/control b/debian/control
index dd22db90277afb5e2bbc5adcde827acb198734cf..4f4d0f58c5480fbaedeb77382fb12e707f09c9a1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
 Uploaders: IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>,
  Jonas Smedegaard <dr@jones.dk>
-Build-Depends: cdbs,
+Build-Depends:
  debhelper,
  dh-buildinfo,
  doxygen,

diff --git a/debian/rules b/debian/rules
index 1b87f63f235b42d626ad6bc00f09062a429fad64..4dff738720c0e959b4426653ce6338f2df4c3533 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,59 +1,52 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-# Description: Main Debian packaging script for jacktrip
-
-
-# Copyright © 2010 IOhannes m zmölnig <zmoelnig@iem.at>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-export QT_SELECT=qt5
 -include /usr/share/dpkg/buildtools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/qmake.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
 PKG_CONFIG ?= pkg-config
 
 CPPFLAGS+=$(shell $(PKG_CONFIG) --cflags rtaudio)
-LDFLAGS +=$(shell $(PKG_CONFIG) --libs   rtaudio)
-
-DEB_MAKE_BUILD_TARGET = release
-DEB_MAKE_INSTALL_TARGET = release-install INSTALL_ROOT=$(DEB_DESTDIR)
+CFLAGS+=-DDEB_BUILD
+CXXFLAGS+=-DDEB_BUILD
+LDFLAGS+=$(shell $(PKG_CONFIG) --libs   rtaudio)
 
-CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
-CDBS_BUILD_DEPENDS_rules_utils_buildinfo =
+export CPPFLAGS
+export CFLAGS
+export CXXFLAGS
+export LDFLAGS
 
+export QT_SELECT=qt5
 DEB_SRCDIR = src
-DEB_DH_INSTALLCHANGELOGS_ARGS = CHANGESLOG.txt
 
-# Suppress scanning documentation images causing false alarms.
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = documentation/img/.*|debian/(changelog|copyright(|_hints|_newhints))$
+%:
+       dh $@ --sourcedirectory=$(DEB_SRCDIR) --buildsystem=qmake
 
-build/jacktrip::
+override_dh_clean:
+       dh_clean
+       rm -rf WWW
+       rm -f jacktrip.1
+
+override_dh_auto_configure:
+       dh_auto_configure
+       cp $(DEB_SRCDIR)/Makefile.Release $(DEB_SRCDIR)/Makefile
+
+override_dh_auto_build:
+       dh_auto_build
        doxygen jacktrip_doxygen
        find WWW -name "*.md5" -delete
        find WWW -name "*.map" -delete
        help2man -N -n "high-quality system for audio network performances" debian/jacktrip-help2man > jacktrip.1
 
-clean::
-       rm -rf WWW
-       rm -f jacktrip.1
+override_dh_installchangelogs:
+       dh_installchangelogs CHANGESLOG.txt
+
+
+licensecheck:
+       licensecheck --deb-machine -r * \
+               -i 'documentation/img/.*|debian/(changelog|copyright(|_hints|_newhints))$' \
+               > debian/copyright_newhints
+       cmp debian/copyright_hints debian/copyright_newhints \
+               && rm debian/copyright_newhints