Set debhelper compatibility level to 7; adapt debian/{control,compat,rules}
authorgregor herrmann <gregoa@debian.org>
Thu, 15 Jan 2009 21:49:46 +0000 (21:49 -0000)
committergregor herrmann <gregoa@debian.org>
Thu, 15 Jan 2009 21:49:46 +0000 (21:49 -0000)
and add debian/iodine.{docs,examples,links}.

debian/changelog
debian/compat
debian/control
debian/iodine.docs [new file with mode: 0644]
debian/iodine.examples [new file with mode: 0644]
debian/iodine.links [new file with mode: 0644]
debian/rules

index f0e8955b00521f7912663ee799d3700c68efed9f..3ad002c2debdb35c5ce4355db6a531f1875af831 100644 (file)
@@ -5,6 +5,8 @@ iodine (0.4.2-3) UNRELEASED; urgency=low
     removing the "--pidfile" option from the start-stop-daemon calls;
     doesn't work for a forking process. Thanks to Michael Goetze for 
     the bug report (closes: #511887).
+  * Set debhelper compatibility level to 7; adapt debian/{control,compat,rules}
+    and add debian/iodine.{docs,examples,links}.
 
  -- gregor herrmann <gregoa@debian.org>  Sun, 02 Nov 2008 13:56:18 +0100
 
index 1e8b314962144c26d5e0e50fd29d2ca327864913..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
@@ -1 +1 @@
-6
+7
index 8bee79cb15ad4adfa3a1a4e0b316c19a49bf48bf..ed7e8f98dc9f1f8d809c2367cda211d1413eb4c7 100644 (file)
@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 6), po-debconf, zlib1g-dev, quilt (>= 0.40), check
+Build-Depends: debhelper (>= 7), po-debconf, zlib1g-dev, quilt (>= 0.40), check
 Standards-Version: 3.8.0
 Homepage: http://code.kryo.se/iodine
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/iodine/trunk/
diff --git a/debian/iodine.docs b/debian/iodine.docs
new file mode 100644 (file)
index 0000000..e845566
--- /dev/null
@@ -0,0 +1 @@
+README
diff --git a/debian/iodine.examples b/debian/iodine.examples
new file mode 100644 (file)
index 0000000..574f87d
--- /dev/null
@@ -0,0 +1 @@
+debian/iodine-jigger
diff --git a/debian/iodine.links b/debian/iodine.links
new file mode 100644 (file)
index 0000000..9518c79
--- /dev/null
@@ -0,0 +1 @@
+usr/share/man/man8/iodine.8 usr/share/man/man8/iodined.8
index 8edb56f1089f3103ac7920a070cd61c6e35f6e20..70ba42cb00117abab8ea950006ead7af3a94528d 100755 (executable)
@@ -1,74 +1,31 @@
 #!/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
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-       dh_testdir
-       touch $@
-
 build: build-stamp
-build-stamp: configure-stamp
-       dh_testdir
-       CFLAGS="$(CFLAGS)" $(MAKE)
-       CFLAGS="$(CFLAGS)" $(MAKE) test
-       touch $@
+build-stamp: $(QUILT_STAMPFN)
+       dh build
+       touch build-stamp
 
 clean: unpatch
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp install-stamp
-       $(MAKE) clean
        debconf-updatepo
-       dh_clean
+       dh clean
 
-install: install-stamp
-install-stamp: build-stamp
-       dh_testdir
-       dh_testroot
+install: build install-stamp
+install-stamp:
+       dh install --before dh_auto_install
        $(MAKE) install DESTDIR=$(CURDIR)/debian/iodine prefix=/usr
-       touch $@
-
+       dh install --after dh_auto_install --before dh_compress
+       dh_compress -Xiodine-jigger
+       dh install --after dh_compress --before dh_installinit
+       dh_installinit --name=iodined
+       dh install --after dh_installinit
+       touch install-stamp
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+binary-arch: install
+       dh binary-arch
 
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs CHANGELOG
-       dh_installdocs README
-       dh_installexamples debian/iodine-jigger
-       dh_installdebconf
-       dh_installinit --name=iodined
-       dh_link usr/share/man/man8/iodine.8 usr/share/man/man8/iodined.8
-       dh_strip
-       dh_compress -Xiodine-jigger
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+binary-indep: install
+       dh binary-indep
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+binary: binary-arch binary-indep