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

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-09-11 09:29:31 +0000 (Fri, 11 Sep 2009)
New Revision: 2427

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


Added: packages/gdal/trunk/debian/README.source
===================================================================
--- packages/gdal/trunk/debian/README.source	                        (rev 0)
+++ packages/gdal/trunk/debian/README.source	2009-09-11 09:29:31 UTC (rev 2427)
@@ -0,0 +1,17 @@
+GDAL source for Debian
+----------------------
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get detailed instructions on how to apply the series of patches
+and modify them, please read /usr/share/doc/quilt/README.source.
+
+Most of applied patches are due to Debian Policy requirements and
+the need of avoiding hidden breakages at every new release, due
+to ABI changes in the public C++ interface. This is the reason
+to embed versions within package and library names.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 01 Sep 2009 22:45:56 +0200
+

Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2009-09-11 09:10:25 UTC (rev 2426)
+++ packages/gdal/trunk/debian/changelog	2009-09-11 09:29:31 UTC (rev 2427)
@@ -1,3 +1,11 @@
+gdal (1.6.2-2) unstable; urgency=low
+
+  * Fixed gdal-grass patch to generate a tarball with a name coherent with
+    current plugin source package.
+  * Added a README.source document.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 11 Sep 2009 11:29:03 +0200
+
 gdal (1.6.2-1) unstable; urgency=low
 
   * New upstream release, with a bounce of bugs fixing.

Modified: packages/gdal/trunk/debian/patches/gdal-grass.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/gdal-grass.dpatch	2009-09-11 09:10:25 UTC (rev 2426)
+++ packages/gdal/trunk/debian/patches/gdal-grass.dpatch	2009-09-11 09:29:31 UTC (rev 2427)
@@ -6,14 +6,26 @@
 
 @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)
+--- gdal-1.6.2~/frmts/grass/GNUmakefile	2009-09-09 09:52:02.000000000 +0200
++++ gdal-1.6.2/frmts/grass/GNUmakefile	2009-09-11 11:26:51.000000000 +0200
+@@ -21,11 +21,13 @@
+ install-obj:	$(O_OBJ:.o=.$(OBJ_EXT))
+ 
+ dist:
+-	cp -r pkg gdal-grass-$(GDAL_VER)
+-	rm -rf gdal-grass-$(GDAL_VER)/.svn
+-	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)
+-	tar czvf gdal-grass-$(GDAL_VER).tar.gz ./gdal-grass-$(GDAL_VER)
+-	rm -rf gdal-grass-$(GDAL_VER)
++	cp -r pkg libgdal-grass-$(GDAL_VER)
++	rm -rf libgdal-grass-$(GDAL_VER)/.svn
++	cp grass57dataset.cpp libgdal-grass-$(GDAL_VER)
++	cp ../../ogr/ogrsf_frmts/grass/*.cpp libgdal-grass-$(GDAL_VER)
++	cp ../../ogr/ogrsf_frmts/grass/*.h libgdal-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)
++	cp ../../VERSION libgdal-grass-$(GDAL_VER)
++	tar czvf libgdal-grass-$(GDAL_VER).tar.gz ./libgdal-grass-$(GDAL_VER)
++	rm -rf libgdal-grass-$(GDAL_VER)
  

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2009-09-11 09:10:25 UTC (rev 2426)
+++ packages/gdal/trunk/debian/rules	2009-09-11 09:29:31 UTC (rev 2427)
@@ -35,6 +35,7 @@
 else
 	@echo Swig is fixed for ogr.py
 endif
+	@echo GDAL version: $(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH)
 
 gdal-grass: configure gdal-grass-dist clean
 gdal-grass-dist:
@@ -181,6 +182,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
+	#find $(CURDIR)/debian/python-gdal -name GDAL-$(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH).egg-info -delete || true
 	dh_pycentral -X.info
 	dh_perl
 	dh_makeshlibs