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

Wed Aug 2 16:27:27 UTC 2006

Author: frankie
Date: 2006-08-02 16:27:20 +0000 (Wed, 02 Aug 2006)
New Revision: 503

Added:
   packages/gdal/trunk/debian/compat
   packages/gdal/trunk/debian/pycompat
Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/python-gdal.files
   packages/gdal/trunk/debian/rules
Log:
Moved to new python policy. The trick is rebuilding
for every python flavor and installing the resulting
modules/extension.


Modified: packages/gdal/trunk/debian/changelog
===================================================================

--- packages/gdal/trunk/debian/changelog	2006-08-01 12:21:31 UTC (rev 502)
+++ packages/gdal/trunk/debian/changelog	2006-08-02 16:27:20 UTC (rev 503)
@@ -1,6 +1,11 @@
 gdal (1.3.2-1) UNRELEASED; urgency=low
 
+  [ Francesco P. Lovergine ]
+
+  The "doing-it-yourself-is-better" release.
+
   * New upstream release. 
+    (closes: #370441)
     As stated previously, changed package name for
     a smooth C++ transition in case of (undocumented) API/ABI changes.
     Changed control and other files as consequence for 1.3.1 -> 1.3.2 transition.
@@ -14,7 +19,13 @@
     	ogrili2layer.cpp.dpatch (gcc 4.1 STL compatibility)
   * Policy bumped to 3.7.2. No changes.
   * Removed a couple of old *.docs and *.files files in debian dir.
-  * Added mysql support
+  * Added mysql support.
+  * Moved to new python policy. Note that python-gdal provides both modules 
+    and an extension, so quite a few changes are required all around.
+    See http://wiki.debian.org/DebianPython/NewPolicy for information about
+    the matter.
+    -- NOTE FOR BACKPORTERS: DO NOT EVEN TRY THAT, WITHOUT BACKPORTING ALL THE NEW PYTHON FRAMEWORK --
+    (Closes: #373433)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 20 Jun 2006 15:06:13 +0200
 

Added: packages/gdal/trunk/debian/compat
===================================================================
--- packages/gdal/trunk/debian/compat	2006-08-01 12:21:31 UTC (rev 502)
+++ packages/gdal/trunk/debian/compat	2006-08-02 16:27:20 UTC (rev 503)
@@ -0,0 +1 @@
+4

Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control	2006-08-01 12:21:31 UTC (rev 502)
+++ packages/gdal/trunk/debian/control	2006-08-02 16:27:20 UTC (rev 503)
@@ -3,8 +3,9 @@
 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>
-Build-Depends: debhelper (>> 4.1.25), 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
+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.4.17)
 Standards-Version: 3.7.2
+XS-Python-Version: all
 
 Package: libgdal1-1.3.2
 Section: libs
@@ -120,6 +121,8 @@
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, python-numeric
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
 Description: Python bindings to the Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the

Added: packages/gdal/trunk/debian/pycompat
===================================================================
--- packages/gdal/trunk/debian/pycompat	2006-08-01 12:21:31 UTC (rev 502)
+++ packages/gdal/trunk/debian/pycompat	2006-08-02 16:27:20 UTC (rev 503)
@@ -0,0 +1 @@
+2

Modified: packages/gdal/trunk/debian/python-gdal.files
===================================================================
--- packages/gdal/trunk/debian/python-gdal.files	2006-08-01 12:21:31 UTC (rev 502)
+++ packages/gdal/trunk/debian/python-gdal.files	2006-08-02 16:27:20 UTC (rev 503)
@@ -1,5 +1,5 @@
 usr/lib/python*
 usr/bin/gdal_merge.py
 usr/bin/pct2rgb.py
-usr/share/man/man1/gdal_merge.py.1
-usr/share/man/man1/pct2rgb.py.1
+usr/share/man/man1/gdal_merge.1
+usr/share/man/man1/pct2rgb.1

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2006-08-01 12:21:31 UTC (rev 502)
+++ packages/gdal/trunk/debian/rules	2006-08-02 16:27:20 UTC (rev 503)
@@ -7,29 +7,29 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 # dpatch targets
 include /usr/share/dpatch/dpatch.make
 
-# extract the non-prefix part of INST_PYMOD
-inst_pymod=$(shell awk -F '/usr' '/INST_PYMOD/ {print $$2}' GDALmake.opt)
+PYVERS=$(shell pyversions -v -r debian/control)
+PYDEF=$(shell pyversions -dv)
 
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
 
-	./configure --prefix=/usr \
-		--mandir=\$$\{prefix\}/share/man \
-		--with-threads \
-		--with-grass=no \
-		--with-geotiff=internal \
-		--with-jasper \
-		--with-netcdf \
-		--with-xerces \
-		--with-geos \
-		--with-mysql
+	for V in $(PYVERS); do \
+		PYTHON=/usr/bin/python$$V ./configure --prefix=/usr \
+			--mandir=\$$\{prefix\}/share/man \
+			--with-threads \
+			--with-grass=no \
+			--with-geotiff=internal \
+			--with-jasper \
+			--with-netcdf \
+			--with-xerces \
+			--with-geos \
+			--with-mysql; \
+		mv GDALmake.opt GDALmake.opt-$$V; \
+	done
 
 	# Patch the generated libtool to avoid passing -rpath when linking,
 	# and to explicitly link libraries against the libraries they
@@ -47,7 +47,8 @@
 build-stamp: 
 	dh_testdir
 
-	$(MAKE)
+	cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
+	$(MAKE) lib-target apps-target
 	$(MAKE) docs
 
 	touch build-stamp
@@ -62,6 +63,7 @@
 	dh_testroot
 
 	-$(MAKE) distclean
+	rm -f GDALmake.opt-*
 
 	dh_clean build-stamp configure-stamp
 
@@ -71,8 +73,13 @@
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr \
-		"INST_PYMOD=\$$(prefix)$(inst_pymod)"
+	for V in $(PYVERS); do \
+		cp GDALmake.opt-$$V GDALmake.opt; \
+		(cd pymod && $(MAKE) clean); \
+		$(MAKE) py-target; \
+		$(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"
@@ -88,14 +95,15 @@
 	dh_testroot
 	dh_movefiles
 	dh_installdocs
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs NEWS
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps -L libgdal1-1.3.1 -l debian/libgdal1-1.3.1/usr/lib
+	dh_shlibdeps -L libgdal1-1.3.2 -l debian/libgdal1-1.3.2/usr/lib
+	dh_pycentral
 	dh_python
 	dh_gencontrol
 	dh_md5sums


