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

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-04-15 18:48:05 +0000 (Wed, 15 Apr 2009)
New Revision: 2154

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/rules
Log:
Swig 1.3.38 has not problems with provided ogr.py


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2009-04-15 15:02:31 UTC (rev 2153)
+++ packages/gdal/trunk/debian/changelog	2009-04-15 18:48:05 UTC (rev 2154)
@@ -19,8 +19,10 @@
     ftpmasters changes.
   * Removed obsolete postgresql-dev dependency.
   * [PATCH] Added swig1338 to be compatible with Swig 1.3.38 (currently in experimental).
+  * Swig 1.3.38 has no more problems with ogr.py, so the on-fly patch application trick is now
+    applied on for past versions in debian/rules.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 13 Apr 2009 11:15:19 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 15 Apr 2009 20:44:18 +0200
 
 gdal (1.6.0-2) experimental; urgency=low
 

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2009-04-15 15:02:31 UTC (rev 2153)
+++ packages/gdal/trunk/debian/rules	2009-04-15 18:48:05 UTC (rev 2154)
@@ -15,7 +15,21 @@
 PYDEF=$(shell pyversions -dv)
 RUBYDEF=$(shell ruby --version|cut -d' ' -f2|cut -d. -f1,2)
 PERLDEF=$(shell perl -V:version|cut -d\' -f2)
+SWIGVER=$(shell swig -version |grep Version|cut -d' ' -f3|sed -e 's/\.//g')
+SWIGOK=$(shell test $(SWIGVER) -ge 1338 && echo yes)
 
+versions:
+	@echo Swig version: $(SWIGVER)
+	@echo Python default: $(PYDEF)
+	@echo Python versions: $(PYVERS)
+	@echo Ruby default: $(RUBYDEF)
+	@echo Perl default: $(PERLDEF)
+ifneq ($(SWIGOK),yes)
+	@echo Swig is not fixed for ogr.py
+else
+	@echo Swig is fixed for ogr.py
+endif
+
 gdal-grass: configure gdal-grass-dist clean
 gdal-grass-dist:
 	ln -fs $(CURDIR)/GDALmake.opt-$(PYDEF) $(CURDIR)/GDALmake.opt
@@ -84,8 +98,11 @@
 		$(MAKE) -C $(CURDIR)/swig/python clean; \
 		$(MAKE) -C $(CURDIR)/swig/python generate build; \
 		$(MAKE) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \
+	# apply conditionally an on-fly patch for pre 1.3.38 swig versions.
+ifneq ($(SWIGOK),yes)
 		echo "Patching ogr.py" ; \
 		patch $(CURDIR)/debian/python-tmp/usr/lib/python$$V/site-packages/osgeo/ogr.py $(CURDIR)/debian/ogr.py.diff; \
+endif
 	done
 	$(MAKE) docs
 	$(MAKE) man
@@ -169,4 +186,4 @@
 
 binary: binary-arch binary-indep
 
-.PHONY: build clean binary-arch binary-indep binary-common binary install patch unpatch clean-unpatched gdal-grass-dist
+.PHONY: build clean binary-arch binary-indep binary-common binary install patch unpatch clean-unpatched gdal-grass-dist versions