* Convert to dh:

  + Build-Depend on debhelper (>= 8).
  + Increase compat level to 8.
  + Shorten debian/rules to the bare essentials.
  + Override dh_makeshlibs to add tcltk-depends

diff --git a/debian/changelog b/debian/changelog
index c4a61eb53fe886304d130c13e3d2574ff2050318..2410283a4e6355cf3119531219816a56865ac85a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ mysqltcl (3.05-4) UNRELEASED; urgency=low
     we should start in lowercase letters.
   * Change maintainer address to hoexter@d.o.
   * Update VCS-* information in debian/control to the new git repository.
+  * Convert to dh:
+    + Build-Depend on debhelper (>= 8).
+    + Increase compat level to 8.
+    + Shorten debian/rules to the bare essentials.
+    + Override dh_makeshlibs call to add tcltk-depends.
 
  -- Sven Hoexter <hoexter@debian.org>  Tue, 26 Apr 2011 16:19:32 +0200
 

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8

diff --git a/debian/control b/debian/control
index 9bac6e864fffdca8d8c351f8d4408e9a3f18c15b..23a92202a1ab497bbe7abe323aeee162fef052c6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mysqltcl
 Section: database
 Priority: optional
 Maintainer: Sven Hoexter <hoexter@debian.org>
-Build-Depends: debhelper (>> 5), tcl-dev, libmysqlclient-dev, quilt
+Build-Depends: debhelper (>= 8), tcl-dev, libmysqlclient-dev, quilt
 Standards-Version: 3.8.2
 Homepage: http://www.xdobry.de/mysqltcl/
 Vcs-Git: git://git.sven.stormbind.net/git/sven/mysqltcl.git

diff --git a/debian/rules b/debian/rules
index 723bf5212a509546c09b2be54d10efa73de96089..de1946d185ecdc28ebb1a6221e9e13f70b1faa17 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-        CONFIGURE_OPTIONS += --build $(DEB_HOST_GNU_TYPE)
-else
-        CONFIGURE_OPTIONS += --build $(DEB_BUILD_GNU_TYPE) \
-                --host $(DEB_HOST_GNU_TYPE)
-endif
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+%:
+       dh $@ --with quilt
 
-CONFIGURE_OPTIONS += \
+override_dh_auto_configure:
+       dh_auto_configure -- \
                --prefix=/usr \
                --enable-threads \
                --mandir=/usr/share/man \
@@ -22,48 +17,9 @@ CONFIGURE_OPTIONS += \
                --with-tcl=/usr/lib \
                --with-tclinclude=/usr/include/tcl \
 
+override_dh_auto_install:
+       dh_auto_install --destdir=$(CURDIR)/debian/mysqltcl
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
-
-configure: patch configure-stamp
-configure-stamp:
-       dh_testdir
-
-       CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-       ./configure $(CONFIGURE_OPTIONS)
-
-       touch configure-stamp
-
-build: configure build-stamp
-build-stamp:
-       dh_testdir
-       $(MAKE)
-       touch build-stamp
-
-clean: cleaner unpatch
-cleaner:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       [ ! -f Makefile ] || $(MAKE) distclean
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/mysqltcl
        mkdir $(CURDIR)/debian/mysqltcl/usr/lib/tcltk
        mv $(CURDIR)/debian/mysqltcl/usr/lib/mysqltcl* \
                $(CURDIR)/debian/mysqltcl/usr/lib/tcltk
@@ -72,28 +28,6 @@ install: build
                $(CURDIR)/debian/mysqltcl/usr/bin \
                $(CURDIR)/debian/mysqltcl/usr/include
 
-
-# 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_installdocs
-       dh_installman
-       dh_installchangelogs ChangeLog
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
+override_dh_makeshlibs:
+       dh_makeshlibs
        tcltk-depends
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure