[libgeotiff-dfsg] 05/06: Don't patch Makefile.in, but only Makefile.am.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository libgeotiff-dfsg.

commit 1bc99f604023e2ee09f253d389dd973b22b21657
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 17 16:33:46 2016 +0200

    Don't patch Makefile.in, but only Makefile.am.
---
 debian/changelog                                   |  1 +
 ...tallation => drop-epsg-data-installation.patch} | 29 ----------------------
 debian/patches/series                              |  2 +-
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 414ede9..7afe38d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libgeotiff-dfsg (1.4.2~rc3-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Drop automake-subdir-objects.patch, applied upstream.
+  * Don't patch Makefile.in, but only Makefile.am.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 17 Aug 2016 16:28:15 +0200
 
diff --git a/debian/patches/drop-epsg-data-installation b/debian/patches/drop-epsg-data-installation.patch
similarity index 69%
rename from debian/patches/drop-epsg-data-installation
rename to debian/patches/drop-epsg-data-installation.patch
index f765e31..f92c984 100644
--- a/debian/patches/drop-epsg-data-installation
+++ b/debian/patches/drop-epsg-data-installation.patch
@@ -2,35 +2,6 @@ Description: Drop EPSG data installation
 Author: Francesco Paolo Lovergine <frankie at debian.org>
 Forwarded: not-needed
 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1100,7 +1100,7 @@ distcleancheck: distclean
- 	       exit 1; } >&2
- check-am: all-am
- check: check-recursive
--all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) geo_config.h
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(csvdir)" "$(DESTDIR)$(includedir)"; do \
-@@ -1163,7 +1163,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-dist_csvDATA install-includeHEADERS
-+install-data-am: install-includeHEADERS
- 
- install-dvi: install-dvi-recursive
- 
-@@ -1211,7 +1211,7 @@ ps: ps-recursive
- 
- ps-am:
- 
--uninstall-am: uninstall-dist_csvDATA uninstall-includeHEADERS \
-+uninstall-am: uninstall-includeHEADERS \
- 	uninstall-libLTLIBRARIES
- 
- .MAKE: $(am__recursive_targets) all install-am install-strip
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -23,42 +23,6 @@ AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index e12eb7f..10caa94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-drop-epsg-data-installation
+drop-epsg-data-installation.patch

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