[libgeotiff-dfsg] 04/06: Drop automake-subdir-objects.patch, applied upstream.

[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 3d503fbb00ebbd51de38b9480557eabbce30eef2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 17 16:29:39 2016 +0200

    Drop automake-subdir-objects.patch, applied upstream.
---
 debian/changelog                             |  1 +
 debian/patches/automake-subdir-objects.patch | 15 ---------------
 debian/patches/drop-epsg-data-installation   |  6 +++---
 debian/patches/series                        |  1 -
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd5be00..414ede9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libgeotiff-dfsg (1.4.2~rc3-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
+  * Drop automake-subdir-objects.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 17 Aug 2016 16:28:15 +0200
 
diff --git a/debian/patches/automake-subdir-objects.patch b/debian/patches/automake-subdir-objects.patch
deleted file mode 100644
index 80bd9df..0000000
--- a/debian/patches/automake-subdir-objects.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix automake warning by adding subdir-objects option.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/geotiff/ticket/80
-Applied-Upstream: https://trac.osgeo.org/geotiff/changeset/2729
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- SUBDIRS = libxtiff . bin man cmake
- 
--AUTOMAKE_OPTIONS =	dist-zip
-+AUTOMAKE_OPTIONS = dist-zip subdir-objects
- ACLOCAL_AMFLAGS = -I m4
- 
- include $(top_srcdir)/m4/doxygen.am
diff --git a/debian/patches/drop-epsg-data-installation b/debian/patches/drop-epsg-data-installation
index 237f437..f765e31 100644
--- a/debian/patches/drop-epsg-data-installation
+++ b/debian/patches/drop-epsg-data-installation
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1126,7 +1126,7 @@ distcleancheck: distclean
+@@ -1100,7 +1100,7 @@ distcleancheck: distclean
  	       exit 1; } >&2
  check-am: all-am
  check: check-recursive
@@ -13,7 +13,7 @@ Forwarded: not-needed
  installdirs: installdirs-recursive
  installdirs-am:
  	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(csvdir)" "$(DESTDIR)$(includedir)"; do \
-@@ -1187,7 +1187,7 @@ info: info-recursive
+@@ -1163,7 +1163,7 @@ info: info-recursive
  
  info-am:
  
@@ -22,7 +22,7 @@ Forwarded: not-needed
  
  install-dvi: install-dvi-recursive
  
-@@ -1235,7 +1235,7 @@ ps: ps-recursive
+@@ -1211,7 +1211,7 @@ ps: ps-recursive
  
  ps-am:
  
diff --git a/debian/patches/series b/debian/patches/series
index a1cb044..e12eb7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 drop-epsg-data-installation
-automake-subdir-objects.patch

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