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

Tue Jan 8 16:28:15 UTC 2008

Author: frankie
Date: 2008-01-08 16:28:15 +0000 (Tue, 08 Jan 2008)
New Revision: 1332

Added:
   packages/gdal/trunk/debian/patches/man.dpatch
Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/gdal-bin.files
   packages/gdal/trunk/debian/patches/00list
   packages/gdal/trunk/debian/rules
Log:
Main changes for 1.5.0 version.


Modified: packages/gdal/trunk/debian/changelog
===================================================================

--- packages/gdal/trunk/debian/changelog	2008-01-07 14:28:26 UTC (rev 1331)
+++ packages/gdal/trunk/debian/changelog	2008-01-08 16:28:15 UTC (rev 1332)
@@ -3,8 +3,17 @@
   * (NOT RELEASED YET) New upstream release
   * Added Vcs-* fields to debian/control
   * Policy bumped to 3.7.3 (no changes)
+  * Ruby stuff does not build correctly with upstream libtool stuff, so
+    overriding in debian/rules.
+    See http://trac.osgeo.org/gdal/ticket/2138 for reference about the issue.
+  * Added a (versioned for safety) build-dep on libtool.
+  * A group of new binaries added to gdal-bin stuff.
+  * [PATCH] man.dpatch:
+  	Man pages are not generated by upstream makefile, added .PHONY entry
+        and explicit generation.
+  * Minor changes for files installation due to changes upstream.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 07 Jan 2008 15:14:13 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 08 Jan 2008 17:26:12 +0100
 
 gdal (1.4.4-1) unstable; urgency=low
 

Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control	2008-01-07 14:28:26 UTC (rev 1331)
+++ packages/gdal/trunk/debian/control	2008-01-08 16:28:15 UTC (rev 1332)
@@ -8,7 +8,7 @@
  libhdf4g-dev, libhdf5-serial-dev, libpq-dev, libxerces27-dev, unixodbc-dev (>=2.2.11), 
  python-dev, python-numeric, doxygen, d-shlibs, libgeos-dev, dpatch, libmysqlclient15-dev, python-all-dev (>= 2.3.5-11), 
  python-central (>=0.5), libcurl4-dev|libcurl-dev, libsqlite3-dev, libogdi3.2-dev,
- ruby, ruby1.8-dev, chrpath, swig
+ ruby, ruby1.8-dev, chrpath, swig, libtool (>=1.5.24-2)
 Standards-Version: 3.7.3
 XS-Python-Version: all
 Homepage: http://www.gdal.org/

Modified: packages/gdal/trunk/debian/gdal-bin.files
===================================================================
--- packages/gdal/trunk/debian/gdal-bin.files	2008-01-07 14:28:26 UTC (rev 1331)
+++ packages/gdal/trunk/debian/gdal-bin.files	2008-01-08 16:28:15 UTC (rev 1332)
@@ -1,3 +1,8 @@
+usr/bin/gdal_grid
+usr/bin/gdalenhance
+usr/bin/gdalmanage
+usr/bin/gdaltransform
+usr/bin/nearblack
 usr/bin/gdal_translate
 usr/bin/gdal_rasterize
 usr/bin/gdalinfo
@@ -15,3 +20,9 @@
 usr/share/man/man1/gdaltindex.1
 usr/share/man/man1/gdal_contour.1
 usr/share/man/man1/ogr*.1
+usr/share/man/man1/gdal2tiles.1
+usr/share/man/man1/gdal_grid.1
+usr/share/man/man1/gdal_retile.1
+usr/share/man/man1/gdaltindex.1
+usr/share/man/man1/gdaltransform.1
+usr/share/man/man1/nearblack.1

Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list	2008-01-07 14:28:26 UTC (rev 1331)
+++ packages/gdal/trunk/debian/patches/00list	2008-01-08 16:28:15 UTC (rev 1332)
@@ -3,3 +3,4 @@
 swig
 doc
 rubymakefile
+man

Added: packages/gdal/trunk/debian/patches/man.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/man.dpatch	                        (rev 0)
+++ packages/gdal/trunk/debian/patches/man.dpatch	2008-01-08 16:28:15 UTC (rev 1332)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## man.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.5.0~/GNUmakefile gdal-1.5.0/GNUmakefile
+--- gdal-1.5.0~/GNUmakefile	2008-01-08 16:43:14.000000000 +0100
++++ gdal-1.5.0/GNUmakefile	2008-01-08 16:45:09.000000000 +0100
+@@ -245,3 +245,4 @@
+ 
+ endif # HAVE_LIBTOOL=no 
+ 
++.PHONY: man


Property changes on: packages/gdal/trunk/debian/patches/man.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2008-01-07 14:28:26 UTC (rev 1331)
+++ packages/gdal/trunk/debian/rules	2008-01-08 16:28:15 UTC (rev 1332)
@@ -41,6 +41,10 @@
 		mv GDALmake.opt GDALmake.opt-$$V; \
 	done
 
+	# Overrides the generated libtool with official one, due to 
+	# breakage in upstream version.
+	cp /usr/bin/libtool $(CURDIR)/libtool
+
 	# Patch the generated libtool to avoid passing -rpath when linking,
 	# and to explicitly link libraries against the libraries they
 	# depend on.
@@ -60,6 +64,7 @@
 	cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
 	$(MAKE) lib-target apps-target swig-target
 	$(MAKE) docs
+	$(MAKE) man
 
 	touch build-stamp
 
@@ -89,12 +94,16 @@
 		(cd pymod && $(MAKE) clean); \
 		$(MAKE) py-target; \
 		$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
+			INST_DATA="\$$(prefix)/share/gdal"  \
 			INST_PYMOD="\$$(prefix)"`awk -F '/usr' '/INST_PYMOD/ {print $$2}' GDALmake.opt` ; \
 	done
 
 	$(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \
 		"INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
-		"INST_MAN=\$$(prefix)/share/man"
+		"INST_MAN=\$$(prefix)/share/man" 
+	$(MAKE) install-man DESTDIR=$(CURDIR)/debian/tmp \
+		"INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
+		"INST_MAN=\$$(prefix)/share/man" 
 	
 	# removing empty packlist MakeMaker files 
 	-find $(CURDIR)/debian/tmp/usr/local/lib/perl -type f -name .packlist -exec rm -f {} \;


