[hamradio-commits] [xastir] 01/01: Rewrote d/rules and moved to debhelper 9

[Iain Learmonth]

This is an automated email from the git hooks/post-receive script.

irl-guest pushed a commit to branch master
in repository xastir.

commit 2e2e25a0514c11aa9a25832b3b27035e35a51f3f
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Wed Mar 25 14:24:30 2015 +0000

    Rewrote d/rules and moved to debhelper 9
---
 debian/changelog   |  3 ++-
 debian/compat      |  2 +-
 debian/control     |  4 ++--
 debian/rules       | 62 ++++++++++++------------------------------------------
 debian/xastir.docs |  9 ++++++++
 5 files changed, 27 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 081e222..d3f77fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ xastir (2.0.6-1) unstable; urgency=medium
 
   * Update to new upstream version (Closes: #761837)
   * Update to 3.9.6 packaging standard.
+  * Update to compat level 9.
+  * Update to debhelper >= 9.
   * Changed priority to optional.
   * Corrected Maintainer: line in control file.
-  * Removed uploaders inactive on the package.
   * Package source now maintained in Hamradio Maintainers' git VCS.
 
  -- Iain R. Learmonth <irl at fsfe.org>  Fri, 21 Nov 2014 20:48:10 +0000
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index b70fbf8..edb1805 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
 Uploaders: Iain R. Learmonth <irl at fsfe.org>, Jerry Stueve <k4int at arrl.net>, Kamal Mostafa <kamal at whence.com>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 7), libax25-dev, libmotif-dev, libxext-dev, libxt-dev, festival-dev, libgraphicsmagick1-dev | libgraphicsmagick-dev, libshp-dev, libproj-dev, libpcre3-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, libgdal-dev (>= 1.10.0-0~), libdb-dev, libgeotiff-dev, dh-autoreconf
+Build-Depends: debhelper (>= 9), libax25-dev, libmotif-dev, libxext-dev, libxt-dev, festival-dev, libgraphicsmagick1-dev | libgraphicsmagick-dev, libshp-dev, libproj-dev, libpcre3-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, libgdal-dev (>= 1.10.0-0~), libdb-dev, libgeotiff-dev, dh-autoreconf
 Homepage: http://www.xastir.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/xastir.git/
-Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/wwl.git
+Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/xastir.git
 
 Package: xastir
 Architecture: any
diff --git a/debian/rules b/debian/rules
index cfeb82b..1e100c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,61 +1,25 @@
 #!/usr/bin/make -f
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
+%:
+	dh $@
 
-	dh_testdir
-	dh_autoreconf
-	touch aclocal.m4
-	touch Makefile.in */Makefile.in */*/Makefile.in
-	touch config.h.in
-	touch configure
-	CFLAGS="-I/usr/include/geotiff $(shell GraphicsMagick-config --cflags)" ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
-	$(MAKE)
-	touch build
-	touch build-stamp
+override_dh_auto_configure:
+	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
+
+override_dh_auto_install:
+	$(MAKE) install DESTDIR=`pwd`/debian/xastir
+	rm -rf debian/xastir/usr/share/doc/xastir/* # The files we want get put back later
+	cp src/testdbfawk debian/xastir/usr/lib/xastir
+	chmod +x debian/xastir/usr/share/xastir/scripts/values
+
+override_dh_auto_installchangelogs:
+	dh_installchangelogs ChangeLog
 
 clean:
 	dh_testdir
 	dh_autoreconf_clean
-	-rm -f build
-	-rm -f build-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	-rm -f src/callpass/Makefile
 	-rm -f config.log config.cache summary.log
 	dh_clean
 
-binary-indep:	build
-# nothing else to do
-
-binary-arch:	build
-	dh_clean
-	dh_installdirs
-	CFLAGS=-I/usr/include/geotiff $(MAKE) install DESTDIR=`pwd`/debian/xastir
-	cp src/testdbfawk debian/xastir/usr/lib/xastir
-	rm -f debian/xastir/usr/share/doc/xastir/*
-	chmod +x debian/xastir/usr/share/xastir/scripts/values
-
-	dh_installdocs AUTHORS README README.MAPS README.Contributing README.CVS README.Getting-Started FAQ NEWS UPGRADE
-	dh_installmenu
-	dh_installchangelogs ChangeLog
-	dh_installman
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:		binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY: binary binary-arch binary-indep clean checkroot
diff --git a/debian/xastir.docs b/debian/xastir.docs
new file mode 100644
index 0000000..e66d172
--- /dev/null
+++ b/debian/xastir.docs
@@ -0,0 +1,9 @@
+AUTHORS
+README
+README.MAPS
+README.Contributing
+README.CVS
+README.Getting-Started
+FAQ
+NEWS
+UPGRADE

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xastir.git