[DebianGIS-dev] r616 - packages/gdal/trunk/debian

[Francesco Lovergine]

Author: frankie
Date: 2007-01-30 23:45:13 +0100 (Tue, 30 Jan 2007)
New Revision: 616

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/rules
Log:
Fixing #385747 in a silly way, upstream autoconf does not manage DEST_DIR...


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2007-01-18 12:15:13 UTC (rev 615)
+++ packages/gdal/trunk/debian/changelog	2007-01-30 22:45:13 UTC (rev 616)
@@ -1,3 +1,11 @@
+gdal (1.3.2-4) UNRELEASED; urgency=low
+
+  * Now copies build-time gdal-config at install-time.
+    (closes: #385747)
+  * Removed Jon Saints and added Paul Wise to Uploaders.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 30 Jan 2007 17:45:14 +0100
+
 gdal (1.3.2-3) unstable; urgency=high
 
   * Urgency high: this release fixes two RC bugs.

Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control	2007-01-18 12:15:13 UTC (rev 615)
+++ packages/gdal/trunk/debian/control	2007-01-30 22:45:13 UTC (rev 616)
@@ -2,7 +2,7 @@
 Section: science
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Steve Halasz <debian at adkgis.org>, Jon Saints <saintsjd at yahoo.com>, Francesco Paolo Lovergine <frankie at debian.org>, Petter Reinholdtsen <pere at debian.org>, Fabio Tranchitella <kobold at debian.org>
+Uploaders: Steve Halasz <debian at adkgis.org>, Francesco Paolo Lovergine <frankie at debian.org>, Petter Reinholdtsen <pere at debian.org>, Fabio Tranchitella <kobold at debian.org>, Paul Wise <pabs at debian.org>
 Build-Depends: debhelper (>= 5.0.37.2), zlib1g-dev, libcfitsio-dev, netcdfg-dev, libtiff4-dev, libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, libhdf4g-dev, libpq-dev | postgresql-dev, libxerces27-dev, unixodbc-dev (>= 2.2.11), libsqlite0-dev, python-dev, python-numeric, doxygen, d-shlibs, libgeos-dev, dpatch, libmysqlclient15-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5)
 Standards-Version: 3.7.2
 XS-Python-Version: all

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2007-01-18 12:15:13 UTC (rev 615)
+++ packages/gdal/trunk/debian/rules	2007-01-30 22:45:13 UTC (rev 616)
@@ -73,6 +73,9 @@
 	dh_clean -k
 	dh_installdirs
 
+	# Save gdal-config for next use
+	cp apps/gdal-config-inst $(CURDIR)/debian/gdal-config.build
+
 	for V in $(PYVERS); do \
 		cp GDALmake.opt-$$V GDALmake.opt; \
 		(cd pymod && $(MAKE) clean); \
@@ -80,10 +83,15 @@
 		$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr \
 			INST_PYMOD="\$$(prefix)"`awk -F '/usr' '/INST_PYMOD/ {print $$2}' GDALmake.opt` ; \
 	done
+
 	$(MAKE) install-docs prefix=$(CURDIR)/debian/tmp/usr \
 		"INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
 		"INST_MAN=\$$(prefix)/share/man"
 
+	# Restore build-time gdal-config
+	cp $(CURDIR)/debian/gdal-config.build $(CURDIR)/debian/tmp/usr/bin/gdal-config && \
+		rm -f $(CURDIR)/debian/gdal-config.build
+
 	# To reach compatibility with window-version which puts gdal-header
 	# files into /usr/include/gdal. I don't want to place headerfiles directly
 	# into /usr/include/gdal to avoid incompatibility with older debian