[proj] 10/15: Drop custom backup handling for autoreconf.

Bas Couwenberg sebastic at debian.org
Tue Aug 16 10:04:36 UTC 2016


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

sebastic pushed a commit to branch master
in repository proj.

commit 2a4a432a7fcfae364e5ae00e7fe7cd2b07a3b096
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 16 11:17:12 2016 +0200

    Drop custom backup handling for autoreconf.
---
 debian/changelog |  1 +
 debian/rules     | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16f803a..435cc66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ proj (4.9.3~rc1+ds-1) UNRELEASED; urgency=medium
   * Drop patches, applied upstream.
   * Rename library package for SONAME bump.
   * Switch to headless variant for default-jdk dependency.
+  * Drop custom backup handling for autoreconf.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 16 Aug 2016 10:35:42 +0200
 
diff --git a/debian/rules b/debian/rules
index 59ed7db..c7507f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,17 +28,6 @@ endif
 
 CFLAGS += -I$(JAVA_HOME)/include/linux
 
-AUTORECONF_BACKUP += INSTALL Makefile.in aclocal.m4
-AUTORECONF_BACKUP += config.guess config.sub configure
-AUTORECONF_BACKUP += depcomp install-sh ltmain.sh
-AUTORECONF_BACKUP += jniwrap/Makefile.in
-AUTORECONF_BACKUP += jniwrap/org/Makefile.in
-AUTORECONF_BACKUP += jniwrap/org/proj4/Makefile.in
-AUTORECONF_BACKUP += man/Makefile.in man/man1/Makefile.in man/man3/Makefile.in
-AUTORECONF_BACKUP += missing mkinstalldirs
-AUTORECONF_BACKUP += nad/Makefile.in src/Makefile.in
-AUTORECONF_BACKUP += src/proj_config.h.in
-
 datumgrids: datumgrids-stamp
 datumgrids-stamp:
 	unshar -c -d $(CURDIR)/nad $(CURDIR)/debian/datumgrids.shar
@@ -50,12 +39,6 @@ datumgrids-stamp:
 		dh $@ --with autoreconf --parallel ; \
 	fi
 
-override_dh_autoreconf:
-	for FILE in $(AUTORECONF_BACKUP); do \
-		mv $${FILE} $${FILE}.pre-autoreconf ; \
-	done
-	dh_autoreconf
-
 override_dh_auto_configure: datumgrids
 	dh_auto_configure -- --with-jni=$(JAVA_HOME)/include
 
@@ -71,14 +54,6 @@ override_dh_auto_clean:
 	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 src/org_proj4_PJ_Type.h
 

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



More information about the Pkg-grass-devel mailing list