From 3c471e738f4eb31e2bf5649acf527987780d4483 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 2 Oct 2013 10:41:32 +0200 Subject: [PATCH] Upgrade to debhelper version 7 --- debian/compat | 2 +- debian/control | 2 +- debian/rules | 111 ++++++++------------------------------------------------ 3 files changed, 18 insertions(+), 97 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 83d231b..de972fa 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Standards-Version: 3.6.2 Maintainer: Adam Dickmeiss Priority: extra -Build-Depends: debhelper (>= 5), +Build-Depends: debhelper (>= 7), libyaz4-dev (>= 4.2.69), libyazpp5-dev (>= 1.4.1), libxslt1-dev, diff --git a/debian/rules b/debian/rules index 0b3b5a1..abd722e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,106 +1,27 @@ #!/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) +override_dh_auto_configure: + dh_auto_configure -- --with-yazpp=/usr/bin --without-usemarcon -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 \ - --with-yazpp=/usr/bin --without-usemarcon \ - --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)" "" -# -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_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 - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. +override_dh_strip: + dh_strip --dbg-package=libmetaproxy4-dbg -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs -A README - dh_installchangelogs - dh_installexamples +override_dh_auto_install: + dh_auto_install mv debian/tmp/usr/share/doc/metaproxy debian/tmp/usr/share/doc/metaproxy-doc mkdir -p debian/tmp/etc/metaproxy cp debian/metaproxy.xml debian/tmp/etc/metaproxy/metaproxy.xml cp rpm/metaproxy.user debian/tmp/etc/metaproxy/metaproxy.user - dh_install -# dh_installmenu -# dh_installdebconf - dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime - dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip --dbg-package=libmetaproxy4-dbg - dh_compress - dh_fixperms -# dh_perl -# dh_python + +override_dh_makeshlibs: dh_makeshlibs -V 'libmetaproxy4 (>= 1.3.28)' - dh_installdeb - dh_shlibdeps -l debian/libmetaproxy4/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 + +override_dh_installdocs: + dh_installdocs -A README -- 1.7.10.4