From 6b21162a41a5ab382a665fe35e0b8f7c201d3629 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Wed, 27 Apr 2011 18:19:47 +0200 Subject: [PATCH] * 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 --- debian/changelog | 5 +++ debian/compat | 2 +- debian/control | 2 +- debian/rules | 84 ++++++------------------------------------------ 4 files changed, 16 insertions(+), 77 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4a61eb..2410283 100644 --- 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 Tue, 26 Apr 2011 16:19:32 +0200 diff --git a/debian/compat b/debian/compat index 7ed6ff8..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +8 diff --git a/debian/control b/debian/control index 9bac6e8..23a9220 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: mysqltcl Section: database Priority: optional Maintainer: Sven Hoexter -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 723bf52..de1946d 100755 --- 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 -- 2.39.5