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

frankie at alioth.debian.org frankie at alioth.debian.org
Tue Dec 15 13:07:38 UTC 2009


Author: frankie
Date: 2009-12-15 13:07:38 +0000 (Tue, 15 Dec 2009)
New Revision: 2626

Modified:
   packages/gdal/trunk/debian/README.source
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/patches/mrsid-plugin.dpatch
   packages/gdal/trunk/debian/rules
Log:
Fixed #560019


Modified: packages/gdal/trunk/debian/README.source
===================================================================
--- packages/gdal/trunk/debian/README.source	2009-12-11 12:20:56 UTC (rev 2625)
+++ packages/gdal/trunk/debian/README.source	2009-12-15 13:07:38 UTC (rev 2626)
@@ -13,5 +13,11 @@
 to ABI changes in the public C++ interface. This is the reason
 to embed versions within package and library names.
 
+Note that debian/rules includes three target (gdal-{grass,ecw,mrsid})
+to autogenerate Grass/ECW/MrSID external plugins which are coherent
+with the plain package provided in Debian. Note that the only 
+plugins which is supported upstream is the Grass one. Do not bother
+upstream with bugs or requests about the other ones.
+
  -- 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-12-11 12:20:56 UTC (rev 2625)
+++ packages/gdal/trunk/debian/changelog	2009-12-15 13:07:38 UTC (rev 2626)
@@ -1,3 +1,11 @@
+gdal (1.6.3-2) unstable; urgency=low
+
+  * Addded a couple of useful target in debian/rules to generate ECW/MrSID plugins.
+  * Fixed gdal-grass tarball name.
+    (closes: #560019)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Dec 2009 14:06:14 +0100
+
 gdal (1.6.3-1) unstable; urgency=low
 
   [ Alan Boudreault ]

Modified: packages/gdal/trunk/debian/patches/mrsid-plugin.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/mrsid-plugin.dpatch	2009-12-11 12:20:56 UTC (rev 2625)
+++ packages/gdal/trunk/debian/patches/mrsid-plugin.dpatch	2009-12-15 13:07:38 UTC (rev 2626)
@@ -14,12 +14,12 @@
  install-obj:	$(O_OBJ:.o=.$(OBJ_EXT))
 +
 +dist:
-+	cp -r pkg gdal-mrsid-$(GDAL_VER)
-+	rm -rf gdal-mrsid-$(GDAL_VER)/.svn
-+	cp *.h gdal-mrsid-$(GDAL_VER)
-+	cp *.cpp gdal-mrsid-$(GDAL_VER)
-+	tar czvf gdal-mrsid-$(GDAL_VER).tar.gz ./gdal-mrsid-$(GDAL_VER)
-+	rm -rf gdal-mrsid-$(GDAL_VER)
++	cp -r pkg libgdal-mrsid-$(GDAL_VER)
++	rm -rf libgdal-mrsid-$(GDAL_VER)/.svn
++	cp *.h libgdal-mrsid-$(GDAL_VER)
++	cp *.cpp libgdal-mrsid-$(GDAL_VER)
++	tar czvf libgdal-mrsid-$(GDAL_VER).tar.gz ./libgdal-mrsid-$(GDAL_VER)
++	rm -rf libgdal-mrsid-$(GDAL_VER)
 diff -urNad gdal-1.6.3~/frmts/mrsid/pkg/Makefile.in gdal-1.6.3/frmts/mrsid/pkg/Makefile.in
 --- gdal-1.6.3~/frmts/mrsid/pkg/Makefile.in	1969-12-31 19:00:00.000000000 -0500
 +++ gdal-1.6.3/frmts/mrsid/pkg/Makefile.in	2009-12-01 09:12:23.800604739 -0500

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2009-12-11 12:20:56 UTC (rev 2625)
+++ packages/gdal/trunk/debian/rules	2009-12-15 13:07:38 UTC (rev 2626)
@@ -37,13 +37,32 @@
 endif
 	@echo GDAL version: $(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH)
 
+#
+# The following targets are useful to autogen independent plugins sources
+#
 gdal-grass: configure gdal-grass-dist clean
 gdal-grass-dist:
 	ln -fs $(CURDIR)/GDALmake.opt-$(PYDEF) $(CURDIR)/GDALmake.opt
 	[ -e $(CURDIR)/GDALmake.opt ] && $(MAKE) -C $(CURDIR)/frmts/grass dist
-	mv $(CURDIR)/frmts/grass/gdal-grass-*.tar.gz $(CURDIR)/..
+	mv $(CURDIR)/frmts/grass/libgdal-grass-*.tar.gz $(CURDIR)/..
 	rm -f $(CURDIR)/GDALmake.opt
 
+gdal-ecw: configure gdal-ecw-dist clean
+gdal-ecw-dist:
+	ln -fs $(CURDIR)/GDALmake.opt-$(PYDEF) $(CURDIR)/GDALmake.opt
+	[ -e $(CURDIR)/GDALmake.opt ] && $(MAKE) -C $(CURDIR)/frmts/ecw dist
+	mv $(CURDIR)/frmts/ecw/libgdal-ecw-*.tar.gz $(CURDIR)/..
+	rm -f $(CURDIR)/GDALmake.opt
+
+gdal-mrsid: configure gdal-mrsid-dist clean
+gdal-mrsid-dist: 
+	ln -fs $(CURDIR)/GDALmake.opt-$(PYDEF) $(CURDIR)/GDALmake.opt
+	[ -e $(CURDIR)/GDALmake.opt ] && $(MAKE) -C $(CURDIR)/frmts/mrsid dist
+	mv $(CURDIR)/frmts/mrsid/libgdal-mrsid-*.tar.gz $(CURDIR)/..
+	rm -f $(CURDIR)/GDALmake.opt
+
+
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir




More information about the Pkg-grass-devel mailing list