Switch to debhelper 7, adjust debian/rules and versioned dependencies in

debian/control.

diff --git a/debian/changelog b/debian/changelog
index e91da0bcbe3119227e45f2634a1e6c9a342d27c5..f1f080d8c58552a89645443158cb13aee375dde3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ cdck (0.7.0-3) UNRELEASED; urgency=low
     - call make with -j1, the upstream build system is not parallel-build safe
   * Set Standards-Version to 3.8.3, add debian/README.source to document quilt
     usage.
+  * Switch to debhelper 7, adjust debian/rules and versioned dependencies in
+    debian/control.
 
  -- gregor herrmann <gregoa@debian.org>  Fri, 06 Nov 2009 17:43:04 +0100
 

diff --git a/debian/clean b/debian/clean
new file mode 100644 (file)
index 0000000..fea9000
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+config.sub
+config.guess

diff --git a/debian/compat b/debian/compat
index 1e8b314962144c26d5e0e50fd29d2ca327864913..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7

diff --git a/debian/control b/debian/control
index 50e4bd7071d59dbc6359c02ee03b76d8db54d39d..b496619cd92e116f24ffb57515c490c8af9237c1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 6), autotools-dev, quilt
+Build-Depends: debhelper (>= 7.0.50), autotools-dev, quilt (>= 0.46-7)
 Standards-Version: 3.8.3
 Homepage: http://swaj.net/unix/index.html#cdck
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/cdck/trunk/

diff --git a/debian/rules b/debian/rules
index ebfa2d98ea22f25ae7a9f25a25a17f8e9270dbdd..dbc29f8602b52b23fe4417a7eae54a4ef88207c7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-config.status: configure
-       dh_testdir
+%:
+       dh --with quilt $@
 
+override_dh_auto_configure:
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -35,51 +11,11 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
        cp -f /usr/share/misc/config.guess config.guess
 endif
 
-       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS=" -Wl,-z,defs"
-
-
-build: build-stamp
-build-stamp: config.status $(QUILT_STAMPFN)
-       dh_testdir
-       $(MAKE) -j1
-       touch $@
+       dh_auto_configure
 
-clean: unpatch
-       dh_testdir
-       dh_testroot
-       rm -f config.sub config.guess
-       rm -f build-stamp install-stamp
-       [ ! -f Makefile ] || $(MAKE) distclean
-       dh_clean
+override_dh_auto_build:
+       dh_auto_build -- -j1
 
-install: install-stamp
-install-stamp: build-stamp
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/cdck
+override_dh_auto_install:
+       dh_auto_install -- DESTDIR=$(CURDIR)/debian/cdck
        rm -rf $(CURDIR)/debian/cdck/usr/lib
-       touch $@
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs ChangeLog
-       dh_installdocs
-       dh_installman
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install