- add ${misc:Depends}

* Set debhelper compatibility level to 7; adapt
  debian/{control,compat,rules}.

diff --git a/debian/changelog b/debian/changelog
index 59df535d11f0fc1316c65fb421372eaaf590e922..b017a59753c0b7e9ebc2a4298cb590051a62df89 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,13 @@ mimetic (0.9.6-1) UNRELEASED; urgency=low
     - change Section to debug for libmimetic0-dbg
     - remove Section for libmimetic0 (duplicate)
     - set Standards-Version to 3.8.1 (no changes)
+    - add ${misc:Depends}
   * debian/copyright: update years of upstream and packaging copyright; the
     upstream code is now released under the MIT license; update "headers".
   * Remove debian/libmimetic-doc.{postinst,prerem}, install-docs doesn't need
     to be called manually anymore.
+  * Set debhelper compatibility level to 7; adapt
+    debian/{control,compat,rules}.
 
  -- gregor herrmann <gregoa@debian.org>  Sun, 15 Mar 2009 19:25:50 +0100
 

diff --git a/debian/clean b/debian/clean
new file mode 100644 (file)
index 0000000..6924d36
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+config.sub
+config.guess
+test/autocutee.mk

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 5d70d610ac2cd58ca1e00991f8cde7b1357fb01d..0b5df170461b12fc6117747c50ca6d1538b6a9ad 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mimetic
 Priority: optional
 Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 6), autotools-dev, doxygen
+Build-Depends: debhelper (>= 7.0.50), autotools-dev, doxygen
 Standards-Version: 3.8.1
 Section: libs
 Homepage: http://codesink.org/mimetic_mime_library.html
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/mimetic/t
 Package: libmimetic-dev
 Section: libdevel
 Architecture: any
-Depends: libmimetic0 (= ${binary:Version})
+Depends: ${misc:Depends}, libmimetic0 (= ${binary:Version})
 Suggests: libmimetic-doc
 Description: C++ MIME library (development)
  mimetic is a GPL MIME library written in C++ designed to be easy to use and
@@ -30,6 +30,7 @@ Description: C++ MIME library (development)
 Package: libmimetic-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Recommends: libmimetic-dev (>= 0.8.9-5)
 Conflicts: libmimetic-dev (<< 0.8.9-5)
 Replaces: libmimetic-dev (<< 0.8.9-5)
@@ -66,7 +67,7 @@ Package: libmimetic0-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libmimetic0 (= ${binary:Version})
+Depends: ${misc:Depends}, libmimetic0 (= ${binary:Version})
 Description: C++ MIME library (debug)
  mimetic is a GPL MIME library written in C++ designed to be easy to use and
  integrate but yet fast and efficient.

diff --git a/debian/rules b/debian/rules
index 360b49656054c1f1b2e069e7335f2e90fe205934..a87288afba84fc4ac842798704941ea93b2b259b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# 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)))
@@ -23,63 +17,27 @@ else
        CFLAGS += -O2
 endif
 
-config.status:
-       dh_testdir
+%:
+       dh $@
 
+override_dh_auto_configure:
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
        cp -f /usr/share/misc/config.guess config.guess
 endif
+       dh_auto_configure
 
-       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-build-stamp: config.status
-       dh_testdir
-       $(MAKE)
+override_dh_auto_build:
+       dh_auto_build
        $(MAKE) -C $(CURDIR)/doc docs
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       dh_clean build-stamp install-stamp clean-stamp config.sub config.guess test/autocutee.mk
-       [ ! -f Makefile ] || $(MAKE) distclean
 
-install: install-stamp
-install-stamp: build-stamp
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       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_installexamples
-       dh_install --sourcedir=debian/tmp
-       dh_link
+override_dh_strip:
        dh_strip --dbg-package=libmimetic0-dbg
+
+override_dh_compress:
        dh_compress -Xexamples
-       dh_fixperms
-       dh_makeshlibs -Xdebug
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_makeshlibs:
+       dh_makeshlibs -Xdebug