Author: frankie
Date: 2009-04-15 15:01:32 +0000 (Wed, 15 Apr 2009)
New Revision: 2152

Added:
   packages/gdal/trunk/debian/patches/hdf5.dpatch
   packages/gdal/trunk/debian/patches/swig1338.dpatch
Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/patches/00list
   packages/gdal/trunk/debian/patches/rubymakefile.dpatch
Log:
New patches and fixes for experimental.


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog        2009-04-15 14:28:17 UTC (rev 
2151)
+++ packages/gdal/trunk/debian/changelog        2009-04-15 15:01:32 UTC (rev 
2152)
@@ -12,11 +12,15 @@
   * Moved to libproj-dev build-dependency and recommending proj-bin.
   * Moved to libhdf4-alt-dev build-dependency to be compatible with netcdf 
library.
     (closes: #495353)
+  * [PATCH] Added hdf5.dpatch to link the -alt HDF4 libs.
+  * Added ODBC support for ESRI personal geo database.
   * Policy bumped to 3.8.1. No changes.
   * Changed section to ruby in ruby-related packages stanzas, due to
     ftpmasters changes.
+  * Removed obsolete postgresql-dev dependency.
+  * [PATCH] Added swig1338 to be compatible with Swig 1.3.38 (currently in 
experimental)
 
- -- Francesco Paolo Lovergine <fran...@debian.org>  Fri, 10 Apr 2009 17:59:22 
+0200
+ -- Francesco Paolo Lovergine <fran...@debian.org>  Mon, 13 Apr 2009 11:15:19 
+0200
 
 gdal (1.6.0-2) experimental; urgency=low
 

Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control  2009-04-15 14:28:17 UTC (rev 2151)
+++ packages/gdal/trunk/debian/control  2009-04-15 15:01:32 UTC (rev 2152)
@@ -5,7 +5,7 @@
 Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
 Build-Depends: debhelper (>= 7), zlib1g-dev, libnetcdf-dev,
  libjasper-dev, libpng12-dev, libjpeg62-dev, libgif-dev,
- libhdf4g-dev, libhdf5-serial-dev, libpq-dev, libxerces-c2-dev, unixodbc-dev 
(>= 2.2.11), libmysqlclient15-dev,
+ libhdf4-alt-dev, libhdf5-serial-dev, libpq-dev, libxerces-c2-dev, 
unixodbc-dev (>= 2.2.11), libmysqlclient15-dev,
  python-dev, python-numpy, doxygen, d-shlibs, libgeos-dev, dpatch, 
libmysqlclient15-dev, python-all-dev (>= 2.3.5-11~), 
  python-central (>= 0.5), libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
  ruby, ruby1.8-dev, chrpath, swig, libtool (>= 1.5.24-2), patch, 
libexpat1-dev, libproj-dev
@@ -43,8 +43,8 @@
 Section: libdevel
 Architecture: any
 Depends: libgdal1-1.6.0 (=${binary:Version}), libc6-dev, libnetcdf-dev, 
- libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libgif-dev, 
libhdf4g-dev, 
- libpq-dev | postgresql-dev, libxerces-c2-dev, unixodbc-dev, libsqlite3-dev, 
libgeos-dev,
+ libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libgif-dev, 
libhdf4-alt-dev, 
+ libpq-dev, libxerces-c2-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
  libmysqlclient15-dev, libhdf5-serial-dev, libltdl3-dev, 
libcurl4-dev|libcurl3-dev
 Suggests: libgdal-doc
 Provides: libgdal-dev

Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list   2009-04-15 14:28:17 UTC (rev 
2151)
+++ packages/gdal/trunk/debian/patches/00list   2009-04-15 15:01:32 UTC (rev 
2152)
@@ -6,3 +6,6 @@
 gdalpaths
 python
 doxygen
+hdf5
+mysql5.1
+swig1338

Added: packages/gdal/trunk/debian/patches/hdf5.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/hdf5.dpatch                              
(rev 0)
+++ packages/gdal/trunk/debian/patches/hdf5.dpatch      2009-04-15 15:01:32 UTC 
(rev 2152)
@@ -0,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hdf5.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.0~/configure gdal-1.6.0/configure
+--- gdal-1.6.0~/configure      2009-04-06 22:37:03.000000000 +0200
++++ gdal-1.6.0/configure       2009-04-06 22:47:36.000000000 +0200
+@@ -22244,13 +22244,13 @@
+     LIBS="-L$HDF_LIB_DIR $LIBS"
+   fi
+ 
+-  { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdf" >&5
+-echo $ECHO_N "checking for SDreaddata in -lmfhdf... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdfalt" >&5
++echo $ECHO_N "checking for SDreaddata in -lmfhdfalt.. $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mfhdf_SDreaddata+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmfhdf -ldf $LIBS"
++LIBS="-lmfhdfalt -ldfalt $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22306,7 +22306,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
+ echo "${ECHO_T}$ac_cv_lib_mfhdf_SDreaddata" >&6; }
+ if test $ac_cv_lib_mfhdf_SDreaddata = yes; then
+-  HDF_LIB_NAME="-lmfhdf -ldf"
++  HDF_LIB_NAME="-lmfhdfalt -ldfalt"
+ else
+   HDF_LIB_NAME=missing
+ fi
+@@ -22384,13 +22384,13 @@
+ 
+   if test "$HDF_LIB_NAME" = "missing" ; then
+     unset ac_cv_lib_mfhdf_SDreaddata
+-    { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdf" >&5
+-echo $ECHO_N "checking for SDreaddata in -lmfhdf... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdfalt" >&5
++echo $ECHO_N "checking for SDreaddata in -lmfhdfalt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mfhdf_SDreaddata+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmfhdf -ldf -ljpeg -lz $LIBS"
++LIBS="-lmfhdfalt -ldfalt -ljpeg -lz $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22446,7 +22446,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
+ echo "${ECHO_T}$ac_cv_lib_mfhdf_SDreaddata" >&6; }
+ if test $ac_cv_lib_mfhdf_SDreaddata = yes; then
+-  HDF_LIB_NAME="-lmfhdf -ldf"
++  HDF_LIB_NAME="-lmfhdfalt -ldfalt"
+ else
+   HDF_LIB_NAME=missing
+ fi
+@@ -22455,13 +22455,13 @@
+ 
+   if test "$HDF_LIB_NAME" = "missing" ; then
+     unset ac_cv_lib_mfhdf_SDreaddata
+-    { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdf" >&5
+-echo $ECHO_N "checking for SDreaddata in -lmfhdf... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdfalt" >&5
++echo $ECHO_N "checking for SDreaddata in -lmfhdfalt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mfhdf_SDreaddata+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmfhdf -ldf -lsz -ljpeg -lz $LIBS"
++LIBS="-lmfhdfalt -ldfalt -lsz -ljpeg -lz $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22517,7 +22517,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
+ echo "${ECHO_T}$ac_cv_lib_mfhdf_SDreaddata" >&6; }
+ if test $ac_cv_lib_mfhdf_SDreaddata = yes; then
+-  HDF_LIB_NAME="-lmfhdf -ldf -lsz"
++  HDF_LIB_NAME="-lmfhdfalt -ldfalt -lsz"
+ else
+   HDF_LIB_NAME=missing
+ fi


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

Modified: packages/gdal/trunk/debian/patches/rubymakefile.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/rubymakefile.dpatch      2009-04-15 
14:28:17 UTC (rev 2151)
+++ packages/gdal/trunk/debian/patches/rubymakefile.dpatch      2009-04-15 
15:01:32 UTC (rev 2152)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gdal-1.4.3~/swig/ruby/RubyMakefile.mk 
gdal-1.4.3/swig/ruby/RubyMakefile.mk
---- gdal-1.4.3~/swig/ruby/RubyMakefile.mk      2007-11-15 18:06:32.000000000 
+0100
-+++ gdal-1.4.3/swig/ruby/RubyMakefile.mk       2007-11-16 10:52:00.000000000 
+0100
+diff -urNad gdal-1.6.0~/swig/ruby/RubyMakefile.mk 
gdal-1.6.0/swig/ruby/RubyMakefile.mk
+--- gdal-1.6.0~/swig/ruby/RubyMakefile.mk      2006-12-21 03:49:08.000000000 
+0100
++++ gdal-1.6.0/swig/ruby/RubyMakefile.mk       2009-03-06 20:20:58.000000000 
+0100
 @@ -25,7 +25,9 @@
  INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
  

Added: packages/gdal/trunk/debian/patches/swig1338.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/swig1338.dpatch                          
(rev 0)
+++ packages/gdal/trunk/debian/patches/swig1338.dpatch  2009-04-15 15:01:32 UTC 
(rev 2152)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## swig1338.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.0~/swig/include/python/typemaps_python.i 
gdal-1.6.0/swig/include/python/typemaps_python.i
+--- gdal-1.6.0~/swig/include/python/typemaps_python.i  2008-09-22 
00:52:46.000000000 +0200
++++ gdal-1.6.0/swig/include/python/typemaps_python.i   2009-04-15 
16:58:36.000000000 +0200
+@@ -877,7 +877,11 @@
+   for( int i = 0; i<$1; i++ ) {
+ 
+       PyObject *o = PySequence_GetItem($input,i);
++%#if SWIG_VERSION <= 0x010337
+       PySwigObject *sobj = SWIG_Python_GetSwigThis(o);
++%#else
++      SwigPyObject *sobj = SWIG_Python_GetSwigThis(o);
++%#endif
+       type* rawobjectpointer = NULL;
+       if (sobj) {
+           Py_DECREF(sobj);


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


_______________________________________________
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