Author: frankie
Date: 2009-05-24 10:50:53 +0000 (Sun, 24 May 2009)
New Revision: 2232
Added:
packages/gdal/trunk/debian/patches/cpl_dll.dpatch
Modified:
packages/gdal/trunk/debian/changelog
packages/gdal/trunk/debian/patches/00list
packages/gdal/trunk/debian/rules
Log:
Fixed python oddity
Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog 2009-05-24 09:46:03 UTC (rev
2231)
+++ packages/gdal/trunk/debian/changelog 2009-05-24 10:50:53 UTC (rev
2232)
@@ -1,9 +1,9 @@
gdal (1.6.1-2) experimental; urgency=low
* Removed superfluous patches, applied upstream: mysql5.1, swig1338
- * Do not regenerate swig stuff for python, the upstream enclosed is
- more recent than sid/experimental which are broken on some regards.
- Note that perl swig stuff enclosed within upstream tarball is still broken.
+ * [PATCH] Added cpl_ddl.dpatch to fix missing external declaration. Note
that
+ the default -fvisibility=hidden is propagated into python stuff and other
+ swig bindings.
(closes: #529745)
* Fixed watch file url.
(closes: #504715)
Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list 2009-05-24 09:46:03 UTC (rev
2231)
+++ packages/gdal/trunk/debian/patches/00list 2009-05-24 10:50:53 UTC (rev
2232)
@@ -7,3 +7,4 @@
python
doxygen
hdf4
+cpl_dll
Added: packages/gdal/trunk/debian/patches/cpl_dll.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/cpl_dll.dpatch
(rev 0)
+++ packages/gdal/trunk/debian/patches/cpl_dll.dpatch 2009-05-24 10:50:53 UTC
(rev 2232)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cpl_dll.dpatch by Francesco Paolo Lovergine <fran...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad gdal-1.6.1~/swig/python/extensions/_gdal_array.cpp
gdal-1.6.1/swig/python/extensions/_gdal_array.cpp
+--- gdal-1.6.1~/swig/python/extensions/_gdal_array.cpp 2007-10-30
21:22:28.000000000 +0100
++++ gdal-1.6.1/swig/python/extensions/_gdal_array.cpp 2009-05-24
11:27:30.000000000 +0200
+@@ -106,7 +106,7 @@
+ {NULL, NULL, 0, NULL}
+ };
+
+-PyMODINIT_FUNC
++PyMODINIT_FUNC CPL_DLL
+ init_gdal_array(void)
+ {
+ PyObject* module;
Property changes on: packages/gdal/trunk/debian/patches/cpl_dll.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules 2009-05-24 09:46:03 UTC (rev 2231)
+++ packages/gdal/trunk/debian/rules 2009-05-24 10:50:53 UTC (rev 2232)
@@ -18,15 +18,6 @@
SWIGVER=$(shell swig -version |grep Version|cut -d' ' -f3|sed -e 's/\.//g')
SWIGOK=$(shell test $(SWIGVER) -ge 1338 && echo yes)
-# This is a silly hack to avoid swig stuff rebuild for python
-GENERATE_SWIG_PYTHON=no
-
-ifneq ($(GENERATE_SWIG_PYTHON),yes)
-PYTHON_SWIG_TAG=build
-else
-PYTHON_SWIG_TAG=generate build
-endif
-
versions:
@echo Swig version: $(SWIGVER)
@echo Python default: $(PYDEF)
@@ -107,7 +98,7 @@
for V in $(PYVERS); do \
cp GDALmake.opt-$$V GDALmake.opt; \
$(MAKE) -C $(CURDIR)/swig/python clean; \
- $(MAKE) -C $(CURDIR)/swig/python $(PYTHON_SWIG_TAG); \
+ $(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; \
@@ -116,7 +107,7 @@
for V in $(PYVERS); do \
cp GDALmake.opt-$$V GDALmake.opt; \
$(MAKE) -C $(CURDIR)/swig/python clean; \
- $(MAKE) -C $(CURDIR)/swig/python $(PYTHON_SWIG_TAG); \
+ $(MAKE) -C $(CURDIR)/swig/python generate build; \
$(MAKE) -C $(CURDIR)/swig/python install
DESTDIR=$(CURDIR)/debian/python-tmp; \
done
endif
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
