[DebianGIS-dev] r2414 - in packages/gdal/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-09-08 14:40:09 +0000 (Tue, 08 Sep 2009)
New Revision: 2414

Added:
   packages/gdal/trunk/debian/patches/gdal-grass.dpatch
Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/rules
Log:
Minor fixes


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2009-09-08 13:04:59 UTC (rev 2413)
+++ packages/gdal/trunk/debian/changelog	2009-09-08 14:40:09 UTC (rev 2414)
@@ -1,8 +1,14 @@
-gdal (1.6.2-1) UNRELEASED; urgency=low
+gdal (1.6.2-1) unstable; urgency=low
 
-  * New upstream release, with minor changes.
+  * New upstream release, with a bounce of bugs fixing.
+  * [PATCH] Added gdal-grass.dpatch to add VERSION to the grass plugin
+    tarball. This is useful to force failing when a binNMU happens while
+    GDAL is transitioning to a major version. See gdal-grass package to 
+    understand  how it is managed. This trick does allow a proper fix
+    of #544978.
+  * Fixed .egg-info stripping. Name and location can change at every release.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 31 Aug 2009 22:53:06 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 08 Sep 2009 14:34:08 +0200
 
 gdal (1.6.1-3) unstable; urgency=low
 

Added: packages/gdal/trunk/debian/patches/gdal-grass.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/gdal-grass.dpatch	                        (rev 0)
+++ packages/gdal/trunk/debian/patches/gdal-grass.dpatch	2009-09-08 14:40:09 UTC (rev 2414)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gdal-grass.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gdal-1.6.2~/frmts/grass/GNUmakefile gdal-1.6.2/frmts/grass/GNUmakefile
+--- gdal-1.6.2~/frmts/grass/GNUmakefile	2009-05-08 06:52:49.000000000 +0200
++++ gdal-1.6.2/frmts/grass/GNUmakefile	2009-09-08 14:33:09.000000000 +0200
+@@ -26,6 +26,8 @@
+ 	cp grass57dataset.cpp gdal-grass-$(GDAL_VER)
+ 	cp ../../ogr/ogrsf_frmts/grass/*.cpp gdal-grass-$(GDAL_VER)
+ 	cp ../../ogr/ogrsf_frmts/grass/*.h gdal-grass-$(GDAL_VER)
++	# Adding VERSION to distribution
++	cp ../../VERSION gdal-grass-$(GDAL_VER)
+ 	tar czvf gdal-grass-$(GDAL_VER).tar.gz ./gdal-grass-$(GDAL_VER)
+ 	rm -rf gdal-grass-$(GDAL_VER)
+ 


Property changes on: packages/gdal/trunk/debian/patches/gdal-grass.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2009-09-08 13:04:59 UTC (rev 2413)
+++ packages/gdal/trunk/debian/rules	2009-09-08 14:40:09 UTC (rev 2414)
@@ -18,6 +18,11 @@
 SWIGVER=$(shell swig -version |grep Version|cut -d' ' -f3|sed -e 's/\.//g')
 SWIGOK=$(shell test $(SWIGVER) -ge 1338 && echo yes)
 
+GDALVER=$(shell cat VERSION|sed -e 's/\./ /g')
+GDAL_MAJOR=$(word 1,$(GDALVER))
+GDAL_MINOR=$(word 2,$(GDALVER))
+GDAL_PATCH=$(word 3,$(GDALVER))
+
 versions:
 	@echo Swig version: $(SWIGVER)
 	@echo Python default: $(PYDEF)
@@ -176,7 +181,7 @@
 	dh_compress
 	dh_fixperms
 	dh_pycentral -X.info
-	rm -f $(CURDIR)/debian/python-gdal/usr/share/pycentral/python-gdal/site-packages/GDAL-1.6.0.egg-info
+	find $(CURDIR)/debian/python-gdal -name GDAL-$(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH).egg-info -delete || true
 	dh_perl
 	dh_makeshlibs
 	dh_installdeb