Upgrade to debhelper version 7 PAZ-898

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7

diff --git a/debian/control b/debian/control
index 47a7910..1721715 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pazpar2
 Section: net
 Priority: extra
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 7),
        autotools-dev,
        libyaz4-dev (>= 4.2.68),
        docbook-xsl,

diff --git a/debian/pazpar2.install b/debian/pazpar2.install
new file mode 100644 (file)
index 0000000..8fb8b93
--- /dev/null
+++ b/debian/pazpar2.install
@@ -0,0 +1 @@
+debian/tmp/usr/sbin/pazpar2

diff --git a/debian/pazpar2.manpages b/debian/pazpar2.manpages
new file mode 100644 (file)
index 0000000..5b65081
--- /dev/null
+++ b/debian/pazpar2.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man?/*

diff --git a/debian/rules b/debian/rules
index 672ab97..e460465 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,128 +1,46 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+export DH_VERBOSE=1
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+       dh $@ --without python-support
 
+override_dh_auto_test:
+       true
 
-# 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-yaz=/usr/bin
 
-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-yaz=/usr/bin \
-               --sysconfdir=/etc --prefix=/usr
-
-build: build-stamp
-
-build-stamp:  config.status
-       dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE)
-
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
-       rm -f config.sub config.guess
-
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # Add here commands to install the package into debian/pazpar2.
-       $(MAKE) DESTDIR=$(CURDIR)/debian/pazpar2 install
-
-# 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_installchangelogs NEWS
-       # pazpar2-doc package
-       mv $(CURDIR)/debian/pazpar2/usr/share/doc/pazpar2/* $(CURDIR)/debian/pazpar2-doc/usr/share/doc/pazpar2-doc
-       # pazpar2 package
-       cp $(CURDIR)/etc/server.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/server.xml
-       cp $(CURDIR)/etc/default.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/services-available/
-       cp $(CURDIR)/etc/mkc.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/services-available/
-       cp $(CURDIR)/etc/services/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/services-available
-       cp $(CURDIR)/etc/settings/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
-       cp -r $(CURDIR)/etc/settings/mkc $(CURDIR)/debian/pazpar2/etc/pazpar2/settings
-       cp $(CURDIR)/etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/
-       # pazpar2-apache2 package
-       cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-apache2/etc/pazpar2
-       # pazpar2-test1 package
-       cp www/test1/index.html $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2/test1/
-       cp www/test1/search.js $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2/test1/
-       # pazpar2-jsdemo package
-       cp www/jsdemo/*.html $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
-       cp www/jsdemo/*.js $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
-       cp www/jsdemo/*.png $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
-       cp www/jsdemo/*.css $(CURDIR)/debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
-       # pazpar2-js package
-       cp $(CURDIR)/debian/ap2pazpar2-js.cfg $(CURDIR)/debian/pazpar2-js/etc/pazpar2
-       mv $(CURDIR)/debian/pazpar2/usr/share/pazpar2/js/pz2.js $(CURDIR)/debian/pazpar2-js/usr/share/pazpar2/js/
-
-       # rest
+override_dh_strip:
+       dh_strip --dbg-package=pazpar2-dbg
 
+override_dh_auto_install:
+       dh_auto_install
+       mkdir -p debian/pazpar2-doc/usr/share/doc
+       mv debian/tmp/usr/share/doc/pazpar2 debian/pazpar2-doc/usr/share/doc/pazpar2-doc
+# pazpar2 package
+       cp etc/server.xml debian/pazpar2/etc/pazpar2/server.xml
+       cp etc/default.xml debian/pazpar2/etc/pazpar2/services-available/
+       cp etc/mkc.xml debian/pazpar2/etc/pazpar2/services-available/
+       cp etc/services/*.xml debian/pazpar2/etc/pazpar2/services-available
+       cp etc/settings/*.xml debian/pazpar2/etc/pazpar2/settings/
+       cp -r etc/settings/mkc debian/pazpar2/etc/pazpar2/settings
+       cp etc/*.xsl debian/pazpar2/etc/pazpar2/
+# pazpar2-apache2 package
+       cp debian/ap2pazpar2.cfg debian/pazpar2-apache2/etc/pazpar2
+# pazpar2-test1 package
+       cp www/test1/index.html debian/pazpar2-test1/usr/share/pazpar2/test1/
+       cp www/test1/search.js debian/pazpar2-test1/usr/share/pazpar2/test1/
+# pazpar2-jsdemo package
+       cp www/jsdemo/*.html debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
+       cp www/jsdemo/*.js debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
+       cp www/jsdemo/*.png debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
+       cp www/jsdemo/*.css debian/pazpar2-jsdemo/usr/share/pazpar2/jsdemo/
+# pazpar2-js package
+       cp debian/ap2pazpar2-js.cfg debian/pazpar2-js/etc/pazpar2
+       mv debian/tmp/usr/share/pazpar2/js/pz2.js debian/pazpar2-js/usr/share/pazpar2/js/
+
+override_dh_installchangelogs:
        dh_installchangelogs NEWS
-       dh_installdocs
-       dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-       dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-       dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip --dbg-package=pazpar2-dbg
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+override_dh_installdocs:
+       dh_installdocs -A README