[DebianGIS-dev] Bug#543629: Proposed NMU fix

[Andreas Barth]

Hi,

the below patch fixes the FTBFS (and also drops the unnecessary
la-file). Unless there are reasons not to I intend to upload it
tomorrow.


Cheers,
Andi


diff -u gdal-1.5.4/debian/rules gdal-1.5.4/debian/rules
--- gdal-1.5.4/debian/rules
+++ gdal-1.5.4/debian/rules
@@ -81,8 +81,6 @@
 		$(MAKE) -C $(CURDIR)/swig/python clean; \
 		$(MAKE) -C $(CURDIR)/swig/python generate build; \
 		$(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; \
 	done
 	$(MAKE) docs
 	$(MAKE) man
diff -u gdal-1.5.4/debian/changelog gdal-1.5.4/debian/changelog
--- gdal-1.5.4/debian/changelog
+++ gdal-1.5.4/debian/changelog
@@ -1,3 +1,13 @@
+gdal (1.5.4-4.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Take patch from http://trac.osgeo.org/gdal/changeset/16826?format=diff&new=16826
+    to fix FTBFS with current swig1.3. Closes: #543629, #542968
+  * Drop /usr/lib/libgdal1.5.0.la as part of that release goal and to allow the
+    depended-on packages to drop theirs.
+
+ -- Andreas Barth <aba at not.so.argh.org>  Sat, 29 Aug 2009 15:19:03 +0200
+
 gdal (1.5.4-4) unstable; urgency=low
 
   * Changed section to ruby for ruby-related packages.
diff -u gdal-1.5.4/debian/libgdal1-dev.install gdal-1.5.4/debian/libgdal1-dev.install
--- gdal-1.5.4/debian/libgdal1-dev.install
+++ gdal-1.5.4/debian/libgdal1-dev.install
@@ -2,5 +2,4 @@
 usr/include
 usr/lib/libgdal1.5.0.a
-usr/lib/libgdal1.5.0.la
 usr/lib/libgdal1.5.0.so
 usr/share/man/man1/gdal-config.1
diff -u gdal-1.5.4/debian/patches/00list gdal-1.5.4/debian/patches/00list
--- gdal-1.5.4/debian/patches/00list
+++ gdal-1.5.4/debian/patches/00list
@@ -7,0 +8 @@
+542968_swig1.39
only in patch2:
unchanged:
--- gdal-1.5.4.orig/debian/patches/542968_swig1.39.dpatch
+++ gdal-1.5.4/debian/patches/542968_swig1.39.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 542968_swig1.39.dpatch by Andreas Barth <aba at not.so.argh.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS on unstable, see #542968, #543629
+## DP: taken from http://trac.osgeo.org/gdal/changeset/16826?format=diff&new=16826
+ at DPATCH@
+Index: gdal/swig/include/gdal.i
+===================================================================
+--- gdal/swig/include/gdal.i (revision 16479)
++++ gdal/swig/include/gdal.i (revision 16826)
+@@ -179,4 +179,17 @@
+ #endif
+ 
++
++/* Default memberin typemaps required to support SWIG 1.3.39 and above */
++%typemap(memberin) char *Info %{
++/* char* Info memberin typemap */
++$1;
++%}
++
++%typemap(memberin) char *Id %{
++/* char* Info memberin typemap */
++$1;
++%}
++
++
+ //************************************************************************
+ //