Upgrade to debhelper version 7 SIM-15

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 608098e..a65fc6b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libnet-z3950-simpleserver-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 4.0.2), libyaz4-dev (>= 4.2.51)
+Build-Depends: debhelper (>= 7), libyaz4-dev (>= 4.2.51)
 Build-Depends-Indep: perl (>= 5.8.0-7)
 Maintainer: Mike Taylor <mike@indexdata.com>
 Standards-Version: 3.6.1

diff --git a/debian/rules b/debian/rules
index 4197e89..56271bb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,102 +1,15 @@
 #!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc@dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
+export DH_VERBOSE=1
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+       dh $@ --without python-support
 
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
+override_dh_auto_test:
+       true
 
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
-
-# Allow disabling build optimation by setting noopt in
-# $DEB_BUILD_OPTIONS
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-
-       # Add commands to compile the package here
-       $(PERL) Makefile.PL INSTALLDIRS=vendor
-       $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-
-       # Add commands to clean up after the build process here
-       [ ! -f Makefile ] || $(MAKE) realclean
-
-       dh_clean build-stamp install-stamp
-
-install: build install-stamp
-install-stamp:
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-
-       # Add commands to install the package into debian/$PACKAGE_NAME here
-       $(MAKE)
-       $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-       # As this is a architecture dependent package, we are not
-       # supposed to install stuff to /usr/share. MakeMaker creates
-       # the dirs, we delete them from the deb:
-
-       # For some reason, the next line doesn't work properly under
-       # Ubuntu 5.10.  No time to figure it out, we'll just use -f
-       # instead for now.
-       rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/share/perl5 || echo "Ignoring rmdir failure"
-
-       touch install-stamp
-
-# 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
-       cp LICENSE debian/copyright
-       dh_installdocs README TODO
-       dh_installexamples 
-#      dh_installmenu
-#      dh_installcron
-#      dh_installman
+override_dh_installchangelogs:
        dh_installchangelogs Changes
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_perl 
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
-source diff:                                                                  
-       @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+override_dh_installdocs:
+       cp LICENSE debian/copyright
+       dh_installdocs -A README