From 0c76a14ed625d6eb940a7ce2e3f142872ae7239a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 15 Sep 2015 21:20:27 +0200 Subject: [PATCH] Upgrade to debhelper version 7 Not upgrading to version 9 now. It would move libraries and modules to /usr/lib/{arch}. --- debian/compat | 2 +- debian/control | 2 +- debian/rules | 110 +++++++++----------------------------------------------- 3 files changed, 19 insertions(+), 95 deletions(-) diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 730adea..a8c167e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: idzebra Priority: optional Maintainer: Adam Dickmeiss Standards-Version: 3.6.0 -Build-Depends: debhelper (>= 4.0.0), +Build-Depends: debhelper (>= 7.0.0), libyaz5-dev (>= 5.0.0), libexpat1-dev, tcl8.5-dev, diff --git a/debian/rules b/debian/rules index 390a83f..855c989 100755 --- a/debian/rules +++ b/debian/rules @@ -1,104 +1,28 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +export DH_VERBOSE=1 -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ --without python-support -# 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) - -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) - -config.status: configure - dh_testdir - # Add here commands to configure the package. - CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - LDFLAGS="$(LDFLAGS)" \ - ./configure --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --enable-shared --enable-static \ +override_dh_auto_configure: + dh_auto_configure -- \ --with-yaz=/usr/bin \ - --with-tclconfig=/usr/lib/tcl8.4 \ - --prefix=/usr - -build: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - if test ! -f config.sub; then cp -f /usr/share/misc/config.sub config.sub ; fi -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - if test ! -f config.guess ; then cp -f /usr/share/misc/config.guess config.guess ; fi -endif + --with-tclconfig=/usr/lib/tcl8.5 - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp +override_dh_auto_test: + true +override_dh_strip: + dh_strip --dbg-package=idzebra-2.0-dbg -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. +override_dh_makeshlibs: + dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.20)' -X mod- -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp -# dh_installmenu -# dh_installdebconf +override_dh_installlogrotate: dh_installlogrotate --name=zebrasrv -# dh_installemacsen -# dh_installpam -# dh_installmime + +override_dh_installinit: dh_installinit --name=zebrasrv -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip --dbg-package=idzebra-2.0-dbg - dh_compress - dh_fixperms -# dh_perl -# dh_python - dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.20)' -X mod- - dh_installdeb - dh_shlibdeps -L libidzebra-2.0 -l debian/libidzebra-2.0/usr/lib - dh_gencontrol - dh_md5sums - dh_builddeb -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_installchangelogs: + dh_installchangelogs NEWS -- 1.7.10.4