Author: frankie
Date: 2008-01-30 16:03:19 +0000 (Wed, 30 Jan 2008)
New Revision: 1367
Modified:
packages/gdal/trunk/debian/changelog
packages/gdal/trunk/debian/patches/swig.dpatch
Log:
Fixed python building
Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog 2008-01-29 22:22:59 UTC (rev
1366)
+++ packages/gdal/trunk/debian/changelog 2008-01-30 16:03:19 UTC (rev
1367)
@@ -4,12 +4,14 @@
* [debian/rules] Added explicit python-binding generation previously missing
Now installs files from new locations because 1.5 moved to ng-python
(swig-based) support. (closes: #463077)
+ * Patch swig.dpatch changed to use the correct python interpreter at building
+ time as found at configuration time. Old pymod fix removed.
* [debian/control] Changed python-numeric -> python-numpy build-dep due to
new-generation python support.
* [debian/rules] Added missing dh_perl call.
(closes: #463086)
- -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Tue, 29 Jan 2008 23:20:36
+0100
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Wed, 30 Jan 2008 17:02:19
+0100
gdal (1.5.0-2) unstable; urgency=low
Modified: packages/gdal/trunk/debian/patches/swig.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/swig.dpatch 2008-01-29 22:22:59 UTC
(rev 1366)
+++ packages/gdal/trunk/debian/patches/swig.dpatch 2008-01-30 16:03:19 UTC
(rev 1367)
@@ -5,15 +5,51 @@
## DP: No description.
@DPATCH@
-diff -urNad gdal-1.4.4~/pymod/GNUmakefile gdal-1.4.4/pymod/GNUmakefile
---- gdal-1.4.4~/pymod/GNUmakefile 2007-12-04 10:59:18.000000000 +0100
-+++ gdal-1.4.4/pymod/GNUmakefile 2007-12-04 10:59:38.000000000 +0100
-@@ -27,7 +27,7 @@
- $(RM) *.o *.$(SO_EXT) *.la
+diff -urNad gdal-1.5.0~/swig/python/GNUmakefile
gdal-1.5.0/swig/python/GNUmakefile
+--- gdal-1.5.0~/swig/python/GNUmakefile 2007-11-26 09:02:20.000000000
+0100
++++ gdal-1.5.0/swig/python/GNUmakefile 2008-01-30 16:59:59.000000000 +0100
+@@ -43,33 +43,33 @@
+ generate: ${WRAPPERS}
- gdal_wrap.c: gdal.i
-- -swig11pl5 -python gdal.i
-+# -swig11pl5 -python gdal.i
+ build:
+- python setup.py build
++ ${PYTHON} setup.py build
- $(GDALMODULE_SO): $(OBJ) $(EXE_DEP_LIBS)
- $(PY_LD_SHARED) $(OBJ) \
+ egg:
+- python setup.py bdist_egg
++ ${PYTHON} setup.py bdist_egg
+
+ install:
+
+ ifeq ($(PY_HAVE_SETUPTOOLS),1)
+- python setup.py install
++ ${PYTHON} setup.py install
+ else
+- python setup.py install --prefix=$(DESTDIR)$(prefix)
++ ${PYTHON} setup.py install --prefix=$(DESTDIR)$(prefix)
+ endif
+
+ for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN)
; done
+
+ docs:
+- python ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrlayer_8cpp.xml ../include/python/docs/ogr_layer_docs.i
OGRLayerShadow OGR_L_
++ ${PYTHON} ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrlayer_8cpp.xml ../include/python/docs/ogr_layer_docs.i
OGRLayerShadow OGR_L_
+
+- python ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrgeometry_8cpp.xml ../include/python/docs/ogr_geometry_docs.i
OGRGeometryShadow OGR_G_
++ ${PYTHON} ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrgeometry_8cpp.xml ../include/python/docs/ogr_geometry_docs.i
OGRGeometryShadow OGR_G_
+
+- python ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrdatasource_8cpp.xml
../include/python/docs/ogr_datasource_docs.i OGRDataSourceShadow OGR_DS_
++ ${PYTHON} ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrdatasource_8cpp.xml
../include/python/docs/ogr_datasource_docs.i OGRDataSourceShadow OGR_DS_
+
+
+- python ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrsfdriver_8cpp.xml ../include/python/docs/ogr_driver_docs.i
OGRDriverShadow OGR_Dr_
++ ${PYTHON} ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrsfdriver_8cpp.xml ../include/python/docs/ogr_driver_docs.i
OGRDriverShadow OGR_Dr_
+
+- python ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrfeature_8cpp.xml ../include/python/docs/ogr_feature_docs.i
OGRFeatureShadow OGR_F_
++ ${PYTHON} ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrfeature_8cpp.xml ../include/python/docs/ogr_feature_docs.i
OGRFeatureShadow OGR_F_
+
+- python ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrfeaturedefn_8cpp.xml
../include/python/docs/ogr_featuredef_docs.i OGRFeatureDefnShadow OGR_FD_
++ ${PYTHON} ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrfeaturedefn_8cpp.xml
../include/python/docs/ogr_featuredef_docs.i OGRFeatureDefnShadow OGR_FD_
+
+- python ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrfielddefn_8cpp.xml ../include/python/docs/ogr_fielddef_docs.i
OGRFieldDefnShadow OGR_Fld_
++ ${PYTHON} ../include/python/docs/doxy2swig.py
../../ogr/xml/ogrfielddefn_8cpp.xml ../include/python/docs/ogr_fielddef_docs.i
OGRFieldDefnShadow OGR_Fld_
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
