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

[Francesco Lovergine]

Author: frankie
Date: 2007-03-27 22:22:34 +0000 (Tue, 27 Mar 2007)
New Revision: 669

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/rules
Log:
Moved gdal header files in /usr/include/gdal


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2007-03-27 22:07:33 UTC (rev 668)
+++ packages/gdal/trunk/debian/changelog	2007-03-27 22:22:34 UTC (rev 669)
@@ -1,3 +1,9 @@
+gdal (1.4.0-2) experimental; urgency=low
+
+  * Moved header files under /usr/include/gdal.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 26 Mar 2007 10:38:28 +0200
+
 gdal (1.4.0-1) experimental; urgency=low
 
   * New upstream version. Moved to libgdal1-dev package, which allows rebuilds

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2007-03-27 22:07:33 UTC (rev 668)
+++ packages/gdal/trunk/debian/rules	2007-03-27 22:22:34 UTC (rev 669)
@@ -20,6 +20,7 @@
 	for V in $(PYVERS); do \
 		PYTHON=/usr/bin/python$$V ./configure --prefix=/usr \
 			--mandir=\$$\{prefix\}/share/man \
+			--includedir=\$$\{prefix\}/include/gdal \
 			--with-threads \
 			--with-grass=no \
 			--with-geotiff=internal \
@@ -76,9 +77,6 @@
 	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); \
@@ -91,16 +89,6 @@
 		"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
-	# package versions
-	ln -fs . `pwd`/debian/tmp/usr/include/gdal
-
 binary-common: 
 	dh_testdir
 	dh_testroot