Author: frankie
Date: 2008-04-19 18:50:57 +0000 (Sat, 19 Apr 2008)
New Revision: 1546

Added:
   packages/gdal/trunk/debian/patches/pythonmakefile.dpatch
Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/patches/00list
   packages/gdal/trunk/debian/rules
Log:
Fixes for python


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog        2008-04-19 14:42:00 UTC (rev 
1545)
+++ packages/gdal/trunk/debian/changelog        2008-04-19 18:50:57 UTC (rev 
1546)
@@ -1,3 +1,14 @@
+gdal (1.5.1-3) unstable; urgency=low
+
+  * Removed old-python stuff still around in debian/rules.
+  * [PATCH] pythonmakefile.dpatch to fix wrong interpreter override in 1.5.1
+    See #2333 on gdal trac.
+    (closes: #476657)
+  * Revised the build/install rules to manage better Swig stuff and
+    specifically Python bindings.
+
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]>  Sat, 19 Apr 2008 19:11:11 
+0200
+
 gdal (1.5.1-2) unstable; urgency=low
 
   * Moved libxerces27-dev dependency to libxerces-c2-dev in debian/control as

Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control  2008-04-19 14:42:00 UTC (rev 1545)
+++ packages/gdal/trunk/debian/control  2008-04-19 18:50:57 UTC (rev 1546)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5.0.37.2), zlib1g-dev, netcdfg-dev,
  libtiff4-dev, libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, 
libungif4-dev,
  libhdf4g-dev, libhdf5-serial-dev, libpq-dev, libxerces-c2-dev, unixodbc-dev 
(>=2.2.11), 
- python-dev, python-numpy, doxygen, d-shlibs, libgeos-dev, dpatch, 
libmysqlclient15-dev, python-all-dev (>= 2.3.5-11), 
+ python-dev, python-numpy, 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, libtool (>=1.5.24-2)
 Standards-Version: 3.7.3

Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list   2008-04-19 14:42:00 UTC (rev 
1545)
+++ packages/gdal/trunk/debian/patches/00list   2008-04-19 18:50:57 UTC (rev 
1546)
@@ -4,3 +4,4 @@
 rubymakefile
 man
 max
+pythonmakefile

Added: packages/gdal/trunk/debian/patches/pythonmakefile.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/pythonmakefile.dpatch                    
        (rev 0)
+++ packages/gdal/trunk/debian/patches/pythonmakefile.dpatch    2008-04-19 
18:50:57 UTC (rev 1546)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## python.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad gdal-1.5.1~/swig/python/GNUmakefile 
gdal-1.5.1/swig/python/GNUmakefile
+--- gdal-1.5.1~/swig/python/GNUmakefile        2008-04-19 13:12:54.000000000 
+0200
++++ gdal-1.5.1/swig/python/GNUmakefile 2008-04-19 13:21:27.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ include ../../GDALmake.opt
+ 
+-ifndef $(PYTHON)
++ifndef PYTHON
+         PYTHON=python
+ endif
+ 


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

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules    2008-04-19 14:42:00 UTC (rev 1545)
+++ packages/gdal/trunk/debian/rules    2008-04-19 18:50:57 UTC (rev 1546)
@@ -64,8 +64,17 @@
        dh_testdir
 
        cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
-       $(MAKE) -C $(CURDIR)/swig/perl generate 
-       $(MAKE) lib-target apps-target swig-target
+       $(MAKE) lib-target apps-target 
+       $(MAKE) -C $(CURDIR)/swig/perl generate build
+       $(MAKE) -C $(CURDIR)/swig/ruby generate build
+
+       # it needs pre-installing just after the building due to intermediate 
cleaning
+       for V in $(PYVERS); do \
+               cp GDALmake.opt-$$V GDALmake.opt; \
+               $(MAKE) -C $(CURDIR)/swig/python clean; \
+               $(MAKE) -C $(CURDIR)/swig/python generate build; \
+               $(MAKE) -C $(CURDIR)/swig/python install 
DESTDIR=$(CURDIR)/debian/python-tmp; \
+       done
        $(MAKE) docs
        $(MAKE) man
 
@@ -81,6 +90,7 @@
        rm -rf $(CURDIR)/swig/perl/*.c  $(CURDIR)/swig/perl/*.cpp
        rm -f GDALmake.opt-*
        rm -rf $(CURDIR)/man/man1
+       rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/python-tmp
 
        dh_clean build-stamp configure-stamp
 
@@ -90,21 +100,18 @@
        dh_clean -k
        dh_installdirs
 
-       for V in $(PYVERS); do \
-               cp GDALmake.opt-$$V GDALmake.opt; \
-               (cd pymod && $(MAKE) clean); \
-               $(MAKE) py-target; \
-               $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
-                       INST_DATA="\$$(prefix)/share/gdal15"  \
-                       INST_PYMOD="\$$(prefix)"`awk -F '/usr' '/INST_PYMOD/ 
{print $$2}' GDALmake.opt` ; \
-       done
-
+       cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
+       $(MAKE) install BINDINGS="perl ruby" DESTDIR=$(CURDIR)/debian/tmp \
+                       INST_DATA="\$$(prefix)/share/gdal15" 
        $(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \
                "INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
                "INST_MAN=\$$(prefix)/share/man" 
        $(MAKE) install-man DESTDIR=$(CURDIR)/debian/tmp \
                "INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
                "INST_MAN=\$$(prefix)/share/man" 
+
+       # install python stuff previuosly built and pre-installed
+       cp -a $(CURDIR)/debian/python-tmp/usr/lib/* 
$(CURDIR)/debian/tmp/usr/lib/.
        
        # removing license file
        rm -f $(CURDIR)/debian/tmp/usr/share/gdal15/LICENSE.TXT


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to