[libgeotiff-dfsg] 06/09: Update Makefile.in patch to also drop installation of removed csv files in Makefile.am.

Bas Couwenberg sebastic at xs4all.nl
Sat Nov 15 15:07:54 UTC 2014


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

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

commit 298d240d9ef4f78d6c5c31032108d911956c3b82
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Nov 15 00:58:10 2014 +0100

    Update Makefile.in patch to also drop installation of removed csv files in Makefile.am.
---
 debian/changelog                           |  2 +
 debian/patches/Makefile.in                 | 32 ----------
 debian/patches/drop-epsg-data-installation | 94 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  2 +-
 4 files changed, 97 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4a5aad..8612063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libgeotiff-dfsg (1.4.1-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Use uscan and Files-Excluded in copyright file to remove non-free
     csv files, repack upstream tarball using xz compression.
+  * Update Makefile.in patch to also drop installation of removed csv
+    files in Makefile.am.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 15 Nov 2014 00:42:21 +0100
 
diff --git a/debian/patches/Makefile.in b/debian/patches/Makefile.in
deleted file mode 100644
index bef7b97..0000000
--- a/debian/patches/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Drop EPSG data installation
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Last-Update: 2013-12-17
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1118,7 +1118,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 \
-@@ -1179,7 +1179,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-dist_csvDATA install-includeHEADERS
-+install-data-am: install-includeHEADERS
- 
- install-dvi: install-dvi-recursive
- 
-@@ -1227,7 +1227,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
diff --git a/debian/patches/drop-epsg-data-installation b/debian/patches/drop-epsg-data-installation
new file mode 100644
index 0000000..85c49a4
--- /dev/null
+++ b/debian/patches/drop-epsg-data-installation
@@ -0,0 +1,94 @@
+Description: Drop EPSG data installation
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-12-17
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1118,7 +1118,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 \
+@@ -1179,7 +1179,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-dist_csvDATA install-includeHEADERS
++install-data-am: install-includeHEADERS
+ 
+ install-dvi: install-dvi-recursive
+ 
+@@ -1227,7 +1227,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)
+ 
+ csvdir = $(datadir)/epsg_csv
+ 
+-dist_csv_DATA = 	csv/alias.csv \
+-			csv/area.csv \
+-			csv/change.csv \
+-			csv/compdcs.csv \
+-			csv/coordinate_axis.csv \
+-			csv/coordinate_axis_name.csv \
+-			csv/coordinate_operation.csv \
+-			csv/coordinate_operation_method.csv \
+-			csv/coordinate_operation_parameter.csv \
+-			csv/coordinate_operation_parameter_value.csv \
+-			csv/coordinate_operation_path.csv \
+-			csv/coordinate_reference_system.csv \
+-			csv/coordinate_system.csv \
+-			csv/csv2c.py \
+-			csv/csv_tools.py \
+-			csv/datum.csv \
+-			csv/datum_shift.csv \
+-			csv/datum_shift_pref.csv \
+-			csv/deprecation.csv \
+-			csv/ellipsoid.csv \
+-			csv/esri_datum_override.csv \
+-			csv/gcs.csv \
+-			csv/gcs.override.csv \
+-			csv/geoccs.csv \
+-			csv/naming_system.csv \
+-			csv/pcs.csv \
+-			csv/pcs.override.csv \
+-			csv/prime_meridian.csv \
+-			csv/projop_wparm.csv \
+-			csv/stateplane.csv \
+-			csv/supersession.csv \
+-			csv/unit_of_measure.csv \
+-			csv/version_history.csv \
+-			csv/vertcs.csv \
+-			csv/vertcs.override.csv
+-
+ include_HEADERS =   geotiff.h \
+                     geo_config.h \
+                     geotiffio.h \
+@@ -100,16 +64,6 @@ libgeotiff_la_SOURCES = cpl_serv.c \
+                         geo_strtod.c \
+                         geotiff_proj4.c
+ 
+-if CSV_IS_CONFIG
+-    libgeotiff_la_SOURCES += csv/datum.c \
+-                             csv/ellipsoid.c \
+-                             csv/gcs.c \
+-                             csv/pcs.c \
+-                             csv/prime_meridian.c \
+-                             csv/projop_wparm.c \
+-                             csv/unit_of_measure.c
+-endif
+-
+ libgeotiff_la_LDFLAGS = -version-info 3:1:1
+ 
+ libgeotiff_la_LIBADD = libxtiff/libxtiff.la
diff --git a/debian/patches/series b/debian/patches/series
index 25e9436..9bf0c18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-Makefile.in
+drop-epsg-data-installation
 docs
 0003-Fix-macro-error-in-manfile.patch 

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



More information about the Pkg-grass-devel mailing list