From c523db0107c1438c85862baa2e4a0fa7023301f4 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Thu, 28 Apr 2011 11:49:28 +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 call to add tcltk-depends. --- debian/changelog | 5 +++ debian/compat | 2 +- debian/control | 3 +- debian/rules | 95 +++++++----------------------------------------- 4 files changed, 22 insertions(+), 83 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0009da1..aa43068 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ tclcurl (7.19.6-2) UNRELEASED; urgency=low * Add ${misc:Depends} to the binary package. * Update homepage url to a generic hostname. * Update VCS-* 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 Wed, 16 Jun 2010 22:31:49 +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 6ecf72a..eba4f2b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,8 @@ Source: tclcurl Section: interpreters Priority: extra Maintainer: Sven Hoexter -Build-Depends: debhelper (>> 5), tcl-dev, libcurl4-gnutls-dev (>= 7.19.6), quilt, bc +Build-Depends: debhelper (>= 8), tcl-dev, libcurl4-gnutls-dev (>= 7.19.6), + quilt, bc Homepage: http://personal.iddeo.es/andresgarci/tclcurl/english/index.html Standards-Version: 3.9.2 Vcs-Git: git://git.sven.stormbind.net/git/sven/tclcurl.git diff --git a/debian/rules b/debian/rules index 99e4f0a..e5c6c5f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,67 +3,23 @@ # 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 - - -CONFIGURE_OPTIONS += \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --enable-threads \ - --with-tcl=/usr/lib \ - --with-tclinclude=/usr/include/tcl \ - - LDFLAGS += -Wl,-z,defs -Wl,--as-needed -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - +%: + dh $@ --with quilt -configure: patch configure-stamp -configure-stamp: - dh_testdir +override_dh_auto_configure: + dh_auto_configure -- \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-threads \ + --with-tcl=/usr/lib \ + --with-tclinclude=/usr/include/tcl \ - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure $(CONFIGURE_OPTIONS) +override_dh_auto_install: + dh_auto_install --destdir=$(CURDIR)/debian/tclcurl - touch configure-stamp - -build: configure build-stamp -build-stamp: configure-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/tclcurl mkdir $(CURDIR)/debian/tclcurl/usr/lib/tcltk mv $(CURDIR)/debian/tclcurl/usr/lib/TclCurl* \ $(CURDIR)/debian/tclcurl/usr/lib/tcltk @@ -77,29 +33,6 @@ install: build $(CURDIR)/tests/multi/double.tcl \ $(CURDIR)/tests/multi/single.tcl - -# 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 Changes.txt - dh_installman - dh_installchangelogs ChangeLog.txt - dh_installexamples - 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