[proj] 10/18: Use minimal dh rules.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch experimental
in repository proj.

commit d026356c0c37cdd14a6f96fa99f14365a6d4ea65
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 3 18:59:07 2014 +0200

    Use minimal dh rules.
---
 debian/changelog |   1 +
 debian/rules     | 108 ++++++++++++++++++-------------------------------------
 2 files changed, 35 insertions(+), 74 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2ae597..1d7ec26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ proj (4.9.0~rc2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Refresh patches.
   * Update copyright file.
+  * Use minimal dh rules.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 03 Oct 2014 17:29:03 +0200
 
diff --git a/debian/rules b/debian/rules
index ca8fb6a..5528833 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DH_ALWAYS_EXCLUDE=CVS:.svn
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
 
 PROJ_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 
@@ -39,59 +40,47 @@ datumgrids-stamp:
 	unshar -c -d $(CURDIR)/nad $(CURDIR)/debian/datumgrids-ch.shar
 	touch $@
 
-config: datumgrids config.status
-config.status: 
+%:
+	if [ "$@" != "datumgrids" -a "$@" != "datumgrids-stamp" ]; then \
+		dh $@ --with autoreconf --parallel ; \
+	fi
+
+override_dh_autoreconf:
 	for FILE in $(AUTORECONF_BACKUP); do \
 		mv $${FILE} $${FILE}.pre-autoreconf ; \
 	done
 	dh_autoreconf
-	./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man --with-jni=$(JAVA_HOME)/include
 
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: config
-	dh_testdir
-	if [ ! -e "jniwrap/libs/jproj.jar" ]; then \
-		dh_auto_build -Sant -Djniwrap -- do_javah jar_it do_make_help ; \
-	fi
-	$(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)"
-	touch $@
+override_dh_auto_configure: datumgrids
+	dh_auto_configure -- --with-jni=$(JAVA_HOME)/include
 
-build-indep: build-indep-stamp
-build-indep-stamp: config
-	touch $@
+override_dh_auto_build:
+	dh_auto_build -Sant -Djniwrap -- do_javah jar_it do_make_help
+	dh_auto_build
 
-clean: 
-	dh_testdir
-	dh_testroot
+override_dh_auto_clean:
 	( cd $(CURDIR)/nad && cat $(CURDIR)/debian/datumgrids.list $(CURDIR)/debian/datumgrids-ch.list | xargs rm -f )
-	rm -f datumgrids-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f $(CURDIR)/debian/*.log
 	dh_auto_clean -Sant -Djniwrap
+	dh_auto_clean
+
+override_dh_autoreconf_clean:
 	dh_autoreconf_clean
 	for FILE in $(AUTORECONF_BACKUP); do \
 		if [ -e "$${FILE}.pre-autoreconf" ]; then \
 			mv $${FILE}.pre-autoreconf $${FILE} ; \
 		fi ; \
 	done
+
+override_dh_clean:
 	dh_clean nad/FL nad/MD nad/TN nad/WI nad/WO \
 	         nad/alaska nad/conus nad/hawaii \
 	         nad/null nad/prvi \
 	         nad/stgeorge nad/stlrnc nad/stpaul \
 	         src/org_proj4_PJ.h src/org_proj4_PJ_Type.h
 
-install: install-arch install-indep
-
-install-arch: install-arch-stamp
-install-arch-stamp: build-arch
-	dh_testdir
-	dh_testroot
-	dh_installdirs -a
-	dh_prep -a
+override_dh_auto_install:
+	dh_auto_install
 	
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install 
 	cp $(CURDIR)/src/projects.h $(CURDIR)/debian/tmp/usr/include/.
 	cp $(CURDIR)/src/org_proj4_PJ.h $(CURDIR)/debian/tmp/usr/include/.
 	cp $(CURDIR)/src/org_proj4_PJ_Type.h $(CURDIR)/debian/tmp/usr/include/.
@@ -101,52 +90,23 @@ install-arch-stamp: build-arch
 	do \
 		sed -i -e 's/^\.nr LL 5.5i$$/\.\\"/' $$man; \
 	done
+
 	# Fixating man section in pj_init.3
 	sed -i -e 's/\(.TH PJ_INIT\) 3U\(.*\)/\1 3\2/' $(CURDIR)/debian/tmp/usr/share/man/man3/pj_init.3
+
 	# Empty dependency_libs in .la files
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
-	touch $@
 
-install-indep: install-indep-stamp
-install-indep-stamp: build-indep
-	touch $@
+override_dh_install:
+	dh_install --list-missing
 
-install-data: install-data-stamp
-install-data-stamp: build-arch
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install-data
-	touch $@
+override_dh_installdocs:
+	dh_installdocs AUTHORS README
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog upstream
+
+override_dh_makeshlibs:
+	# Forces failure ignoring to collect new symbols
+	dh_makeshlibs -- -c0 -v$(PROJ_VERSION)
 
-# Build architecture-independent files here.
-binary-indep: install-indep
-	# proj has no "Architecture: all" binary packages
-
-# Build architecture-dependent files here.
-binary-arch: install-arch
-	dh_testdir -a
-	dh_testroot -a
-	dh_install -a -X.svn
-	dh_installdocs -a AUTHORS README
-	dh_installexamples -a
-	dh_installman -a
-	dh_link -a
-	dh_installchangelogs -a ChangeLog upstream
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-# Forces failure ignoring to collect new symbols
-	dh_makeshlibs -a -- -c0 -v$(PROJ_VERSION)
-	dh_shlibdeps -a
-	dh_installdeb -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-arch binary-indep
-
-.PHONY: build clean binary-indep binary-arch binary datumgrids config install

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