Switch to debhelper 7

diff --git a/debian/compat b/debian/compat
index b8626c4cff2849624fb67f87cd0ad72b163671ad..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index 4310261fac833af86907c9fc83639186dbcc525f..a605871510ddaf1fb26ead8be973aab1b6afc06b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: iec16022
 Section: graphics
 Priority: optional
 Maintainer: Jan Luebbe <jluebbe@lasnet.de>
 Section: graphics
 Priority: optional
 Maintainer: Jan Luebbe <jluebbe@lasnet.de>

-Build-Depends: debhelper (>= 4.0.0), dpatch, zlib1g-dev, libpopt-dev
+Build-Depends: debhelper (>= 7), zlib1g-dev, libpopt-dev

 Standards-Version: 3.6.2.2
 
 Package: iec16022
 Standards-Version: 3.6.2.2
 
 Package: iec16022

diff --git a/debian/rules b/debian/rules
index da7222a06aff26b631217a758b6667e8a8bb3bac..6d9e3bfd76150bf1157eace18e227d4a1c4e800e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,114 +1,23 @@
 #!/usr/bin/make -f
 #!/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.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001

 
 

-include /usr/share/dpatch/dpatch.make
+build: build-stamp
+build-stamp:
+       dh build
+       touch build-stamp

 
 

-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+clean:
+       dh clean

 
 

-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+install: build install-stamp
+install-stamp:
+       dh install
+       touch install-stamp

 
 

+binary-arch: install
+       dh binary-arch

 
 

+binary-indep: install
+       dh binary-indep

 
 

-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp: patch
-       dh_testdir
-
-       touch configure-stamp
-
-
-#Architecture 
-build: build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure
-       $(CC) -o iec16022 iec16022.c -DLIB image.c reedsol.c iec16022ecc200.c -lz -lpopt
-       touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure
-       touch build-indep-stamp
-
-clean: clean-patched unpatch
-clean-patched:
-       dh_testdir
-       dh_testroot
-       rm -f build-arch-stamp build-indep-stamp configure-stamp
-
-       -rm iec16022
-
-       dh_clean 
-
-install: install-arch
-install-indep:
-       dh_testdir
-       dh_testroot
-       dh_clean -k -i 
-       dh_installdirs -i
-
-       # Add here commands to install the indep part of the package into
-       # debian/<package>-doc.
-       #INSTALLDOC#
-
-       dh_install -i
-
-install-arch:
-       dh_testdir
-       dh_testroot
-       dh_clean -k -s 
-       dh_installdirs -s
-
-       # Add here commands to install the arch part of the package into 
-       # debian/tmp.
-       #$(MAKE) install DESTDIR=$(CURDIR)/debian/projectm
-
-       dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs CHANGELOG
-       dh_installdocs
-       #dh_installexamples
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress 
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-       $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-       $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch
-.PHONY: build clean binary install configure
+binary: binary-arch binary-indep