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

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-05-23 10:14:19 +0000 (Sat, 23 May 2009)
New Revision: 2229

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/rules
   packages/gdal/trunk/debian/watch
Log:
Removed swig regeneration at building time.


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2009-05-22 14:02:41 UTC (rev 2228)
+++ packages/gdal/trunk/debian/changelog	2009-05-23 10:14:19 UTC (rev 2229)
@@ -1,8 +1,13 @@
 gdal (1.6.1-2) experimental; urgency=low
 
   * Removed superfluous patches, applied upstream: mysql5.1, swig1338
+  * Do not regenerate swig stuff, the upstream enclosed is more recent than
+    sid/experimental which are broken on some regards.
+    (closes: #529745)
+  * Fixed watch file url.
+    (closes: #504715)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 19 May 2009 15:35:02 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 23 May 2009 12:04:58 +0200
 
 gdal (1.6.1-1) experimental; urgency=low
 

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2009-05-22 14:02:41 UTC (rev 2228)
+++ packages/gdal/trunk/debian/rules	2009-05-23 10:14:19 UTC (rev 2229)
@@ -17,7 +17,14 @@
 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)
+GENERATE_SWIG=no
 
+ifneq ($(GENERATE_SWIG),yes)
+SWIG_TAG=build
+else
+SWIG_TAG=generate build
+endif
+
 versions:
 	@echo Swig version: $(SWIGVER)
 	@echo Python default: $(PYDEF)
@@ -89,8 +96,8 @@
 	
 	cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
 	$(MAKE) lib-target apps-target 
-	$(MAKE) -C $(CURDIR)/swig/perl generate build
-	$(MAKE) -C $(CURDIR)/swig/ruby generate build
+	$(MAKE) -C $(CURDIR)/swig/perl $(SWIG_TAG)
+	$(MAKE) -C $(CURDIR)/swig/ruby $(SWIG_TAG)
 	
 	# It needs pre-installing just after the building due to intermediate cleaning.
 	# Apply conditionally an on-fly patch for pre 1.3.38 swig versions.
@@ -98,7 +105,7 @@
 	for V in $(PYVERS); do \
 		cp GDALmake.opt-$$V GDALmake.opt; \
 		$(MAKE) -C $(CURDIR)/swig/python clean; \
-		$(MAKE) -C $(CURDIR)/swig/python generate build; \
+		$(MAKE) -C $(CURDIR)/swig/python $(SWIG_TAG); \
 		$(MAKE) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \
 		echo "Patching ogr.py" ; \
 		patch $(CURDIR)/debian/python-tmp/usr/lib/python$$V/site-packages/osgeo/ogr.py $(CURDIR)/debian/ogr.py.diff; \
@@ -107,7 +114,7 @@
 	for V in $(PYVERS); do \
 		cp GDALmake.opt-$$V GDALmake.opt; \
 		$(MAKE) -C $(CURDIR)/swig/python clean; \
-		$(MAKE) -C $(CURDIR)/swig/python generate build; \
+		$(MAKE) -C $(CURDIR)/swig/python $(SWIG_TAG); \
 		$(MAKE) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \
 	done
 endif

Modified: packages/gdal/trunk/debian/watch
===================================================================
--- packages/gdal/trunk/debian/watch	2009-05-22 14:02:41 UTC (rev 2228)
+++ packages/gdal/trunk/debian/watch	2009-05-23 10:14:19 UTC (rev 2229)
@@ -1,2 +1,2 @@
 version=3
-ftp://ftp.remotesensing.org/pub/gdal/gdal-([0-9].*)\.tar\.gz 
+http://download.osgeo.org/gdal gdal-([0-9].*)\.tar\.gz