Author: aboudreault-guest Date: 2010-02-25 20:27:37 +0000 (Thu, 25 Feb 2010) New Revision: 2737
Added: packages/gdal/branches/1.7/debian/libgdal1-1.7.0.docs packages/gdal/branches/1.7/debian/libgdal1-1.7.0.install Removed: packages/gdal/branches/1.7/debian/libgdal1-1.6.0.docs packages/gdal/branches/1.7/debian/libgdal1-1.6.0.install packages/gdal/branches/1.7/debian/ogr.py.diff packages/gdal/branches/1.7/debian/patches/cpl_dll.dpatch Modified: packages/gdal/branches/1.7/debian/changelog packages/gdal/branches/1.7/debian/control packages/gdal/branches/1.7/debian/libgdal1-dev.install packages/gdal/branches/1.7/debian/patches/00list packages/gdal/branches/1.7/debian/patches/doc.dpatch packages/gdal/branches/1.7/debian/patches/doxygen.dpatch packages/gdal/branches/1.7/debian/patches/gdalpaths.dpatch packages/gdal/branches/1.7/debian/patches/hdf4.dpatch packages/gdal/branches/1.7/debian/patches/libname.dpatch packages/gdal/branches/1.7/debian/patches/mrsid-plugin.dpatch packages/gdal/branches/1.7/debian/patches/ogdi.dpatch packages/gdal/branches/1.7/debian/patches/python.dpatch packages/gdal/branches/1.7/debian/patches/rubymakefile.dpatch packages/gdal/branches/1.7/debian/rules Log: Updated gdal for 1.7.0 Modified: packages/gdal/branches/1.7/debian/changelog =================================================================== --- packages/gdal/branches/1.7/debian/changelog 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/changelog 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,3 +1,13 @@ +gdal (1.7.1-1) unstable; urgency=low + + * NOT RELEASED. + * New upstream release. + * Patches updated for 1.7.0. + * Removed patches, applied upstream: cpl_dll. + * Removed pre 1.3.38 swig patch (ogr.py.diff). + + -- Alan Boudreault <aboudrea...@mapgears.com> Thu, 18 Feb 2010 10:55:22 -0500 + gdal (1.6.3-3) unstable; urgency=low * Fixed previous dirty workaroud debian/rules for working Doxygen versions. Modified: packages/gdal/branches/1.7/debian/control =================================================================== --- packages/gdal/branches/1.7/debian/control 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/control 2010-02-25 20:27:37 UTC (rev 2737) @@ -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, - libhdf4-alt-dev, libhdf5-serial-dev (>= 1.8.3), libpq-dev, libxerces-c2-dev, unixodbc-dev (>= 2.2.11), + libhdf4-alt-dev, libhdf5-serial-dev (>=1.6.6), libpq-dev, libxerces-c2-dev, unixodbc-dev (>= 2.2.11), python-dev, python-numpy, doxygen, d-shlibs, libgeos-dev, dpatch, libmysqlclient-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 @@ -15,7 +15,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gdal/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gdal/trunk -Package: libgdal1-1.6.0 +Package: libgdal1-1.7.0 Section: libs Architecture: any Depends: ${shlibs:Depends} @@ -42,7 +42,7 @@ Package: libgdal1-dev Section: libdevel Architecture: any -Depends: libgdal1-1.6.0 (=${binary:Version}), libc6-dev, libnetcdf-dev, +Depends: libgdal1-1.7.0 (=${binary:Version}), libc6-dev, libnetcdf-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, libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-dev|libcurl3-dev @@ -71,7 +71,7 @@ Package: libgdal-doc Section: doc Architecture: all -Suggests: libgdal1-1.6.0 (=${binary:Version}) +Suggests: libgdal1-1.7.0 (=${binary:Version}) Homepage: http://www.gdal.org/#index_userdocs Description: Documentation for the Geospatial Data Abstraction Library GDAL is a translator library for raster geospatial data formats. Deleted: packages/gdal/branches/1.7/debian/libgdal1-1.6.0.docs =================================================================== --- packages/gdal/branches/1.7/debian/libgdal1-1.6.0.docs 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/libgdal1-1.6.0.docs 2010-02-25 20:27:37 UTC (rev 2737) @@ -1 +0,0 @@ -NEWS Deleted: packages/gdal/branches/1.7/debian/libgdal1-1.6.0.install =================================================================== --- packages/gdal/branches/1.7/debian/libgdal1-1.6.0.install 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/libgdal1-1.6.0.install 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,2 +0,0 @@ -usr/lib/libgdal1.6.0.so.* -usr/share/gdal16 Added: packages/gdal/branches/1.7/debian/libgdal1-1.7.0.docs =================================================================== --- packages/gdal/branches/1.7/debian/libgdal1-1.7.0.docs (rev 0) +++ packages/gdal/branches/1.7/debian/libgdal1-1.7.0.docs 2010-02-25 20:27:37 UTC (rev 2737) @@ -0,0 +1 @@ +NEWS Added: packages/gdal/branches/1.7/debian/libgdal1-1.7.0.install =================================================================== --- packages/gdal/branches/1.7/debian/libgdal1-1.7.0.install (rev 0) +++ packages/gdal/branches/1.7/debian/libgdal1-1.7.0.install 2010-02-25 20:27:37 UTC (rev 2737) @@ -0,0 +1,2 @@ +usr/lib/libgdal1.7.0.so.* +usr/share/gdal17 Modified: packages/gdal/branches/1.7/debian/libgdal1-dev.install =================================================================== --- packages/gdal/branches/1.7/debian/libgdal1-dev.install 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/libgdal1-dev.install 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,5 +1,5 @@ usr/bin/gdal-config usr/include -usr/lib/libgdal1.6.0.a -usr/lib/libgdal1.6.0.so +usr/lib/libgdal1.7.0.a +usr/lib/libgdal1.7.0.so usr/share/man/man1/gdal-config.1 Deleted: packages/gdal/branches/1.7/debian/ogr.py.diff =================================================================== --- packages/gdal/branches/1.7/debian/ogr.py.diff 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/ogr.py.diff 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,54 +0,0 @@ -This is a patch suggested in #473912 (i.e. fix for upstream bug #2187). -It is merged in 1.5.2 AFAIK. - -diff -urNad gdal-1.5.1~/swig/python/osgeo/ogr.py gdal-1.5.1/swig/python/osgeo/ogr.py ---- gdal-1.5.1~/swig/python/osgeo/ogr.py 2008-04-19 19:46:19.000000000 +0200 -+++ gdal-1.5.1/swig/python/osgeo/ogr.py 2008-05-06 16:50:37.000000000 +0200 -@@ -6,6 +6,8 @@ - - import _ogr - import new -+import types -+ - new_instancemethod = new.instancemethod - try: - _swig_property = property -@@ -38,14 +40,12 @@ - except: strthis = "" - return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,) - --import types - try: - _object = types.ObjectType - _newclass = 1 - except AttributeError: - class _object : pass - _newclass = 0 --del types - - - wkb25Bit = _ogr.wkb25Bit -@@ -561,7 +561,6 @@ - ] would return the first layer on the datasource. - aname'] would return the layer named "aname". - :4] would return a list of the first four layers.""" -- import types - if isinstance(value, types.SliceType): - output = [] - for i in xrange(value.start,value.stop,value.step): -@@ -581,7 +580,6 @@ - - def GetLayer(self,iLayer=0): - """Return the layer given an index or a name""" -- import types - if isinstance(iLayer, types.StringTypes): - return self.GetLayerByName(str(iLayer)) - elif isinstance(iLayer, types.IntType): -@@ -1829,7 +1827,6 @@ - raise AttributeError, name - - def GetField(self, fld_index): -- import types - if isinstance(fld_index, types.StringType): - fld_index = self.GetFieldIndex(fld_index) - if (fld_index < 0) or (fld_index > self.GetFieldCount()): Modified: packages/gdal/branches/1.7/debian/patches/00list =================================================================== --- packages/gdal/branches/1.7/debian/patches/00list 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/00list 2010-02-25 20:27:37 UTC (rev 2737) @@ -7,7 +7,6 @@ python doxygen hdf4 -cpl_dll gdal-grass ecw-plugin mrsid-plugin Deleted: packages/gdal/branches/1.7/debian/patches/cpl_dll.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/cpl_dll.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/cpl_dll.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,19 +0,0 @@ -#! /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; Modified: packages/gdal/branches/1.7/debian/patches/doc.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/doc.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/doc.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,26 +1,26 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## doc.dpatch by Francesco Paolo Lovergine <fran...@debian.org> +## doc.dpatch by Alan Boudreault <aboudrea...@mapgears.com> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ -diff -urNad gdal-1.4.1~/doc/index.dox gdal-1.4.1/doc/index.dox ---- gdal-1.4.1~/doc/index.dox 2007-04-10 17:14:06.000000000 +0200 -+++ gdal-1.4.1/doc/index.dox 2007-05-12 16:33:21.000000000 +0200 -@@ -18,7 +18,7 @@ - for data translation and processing. The \link NEWS.html NEWS\endlink - page describes the January 2007 GDAL 1.4.0 release. +diff -urNad gdal-1.7.1~/doc/index.dox gdal-1.7.1/doc/index.dox +--- gdal-1.7.1~/doc/index.dox 2010-02-18 15:02:46.000000000 -0500 ++++ gdal-1.7.1/doc/index.dox 2010-02-25 12:03:48.553681163 -0500 +@@ -19,7 +19,7 @@ + <a href="http://trac.osgeo.org/gdal/wiki/Release/1.6.3-News";>NEWS</a> + page describes the November 2009 GDAL/OGR 1.6.3 release. --The related <a href="ogr">OGR</a> library (which lives within the GDAL source tree) +-The related <a href="ogr/index.html">OGR</a> library (which lives within the GDAL source tree) +The related <a href="../ogr/index.html">OGR</a> library (which lives within the GDAL source tree) provides a similar capability for simple features vector data. Master: http://www.gdal.org<br> -diff -urNad gdal-1.4.1~/ogr/index.dox gdal-1.4.1/ogr/index.dox ---- gdal-1.4.1~/ogr/index.dox 2007-04-10 17:15:08.000000000 +0200 -+++ gdal-1.4.1/ogr/index.dox 2007-05-12 16:33:02.000000000 +0200 -@@ -5,7 +5,7 @@ +diff -urNad gdal-1.7.1~/ogr/index.dox gdal-1.7.1/ogr/index.dox +--- gdal-1.7.1~/ogr/index.dox 2010-02-18 15:02:46.000000000 -0500 ++++ gdal-1.7.1/ogr/index.dox 2010-02-25 12:04:27.773684026 -0500 +@@ -6,7 +6,7 @@ formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial, and Mapinfo mid/mif and TAB formats.<p> Modified: packages/gdal/branches/1.7/debian/patches/doxygen.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/doxygen.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/doxygen.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -5,15 +5,36 @@ ## DP: No description. @DPATCH@ -diff -urNad gdal-1.6.1~/GNUmakefile gdal-1.6.1/GNUmakefile ---- gdal-1.6.1~/GNUmakefile 2009-05-18 12:01:24.000000000 +0200 -+++ gdal-1.6.1/GNUmakefile 2009-05-18 12:03:15.000000000 +0200 -@@ -146,7 +146,7 @@ +diff -urNad gdal-1.7.1~/GNUmakefile gdal-1.7.1/GNUmakefile +--- gdal-1.7.1~/GNUmakefile 2010-02-08 14:52:34.000000000 -0500 ++++ gdal-1.7.1/GNUmakefile 2010-02-18 12:03:27.720313511 -0500 +@@ -130,7 +130,7 @@ man: # Generate man pages -- (cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps"; echo "FILE_PATTERNS=*utilities.dox gdalwarp.cpp"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen - -+ (cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps swig/pyhton/scripts"; echo "FILE_PATTERNS=*.dox *.cpp"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen - +- (cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=apps swig/python/scripts"; echo "FILE_PATTERNS=*.cpp *.dox"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen - ++ (cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps swig/python/scripts"; echo "FILE_PATTERNS=*.cpp *.dox"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen - all: default ogr-all +diff -urNad gdal-1.7.1~/GNUmakefile.rej gdal-1.7.1/GNUmakefile.rej +--- gdal-1.7.1~/GNUmakefile.rej 1969-12-31 19:00:00.000000000 -0500 ++++ gdal-1.7.1/GNUmakefile.rej 2010-02-18 12:01:05.883683184 -0500 +@@ -0,0 +1,17 @@ ++*************** ++*** 146,152 **** ++ ++ man: ++ # Generate man pages ++- (cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps"; echo "FILE_PATTERNS=*utilities.dox gdalwarp.cpp"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen - ++ ++ all: default ogr-all ++ ++--- 146,152 ---- ++ ++ man: ++ # Generate man pages +++ (cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps swig/pyhton/scripts"; echo "FILE_PATTERNS=*.dox *.cpp"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen - ++ ++ all: default ogr-all ++ Modified: packages/gdal/branches/1.7/debian/patches/gdalpaths.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/gdalpaths.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/gdalpaths.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -13,7 +13,7 @@ GDAL_PREFIX "/PlugIns"); #else - GDAL_PREFIX "/lib/gdalplugins" ); -+ GDAL_PREFIX "/lib/gdal16plugins" ); ++ GDAL_PREFIX "/lib/gdal17plugins" ); #endif #else char szExecPath[1024]; @@ -25,7 +25,7 @@ GDAL_PREFIX "/PlugIns"); #else - GDAL_PREFIX "/lib/gdalplugins" ); -+ GDAL_PREFIX "/lib/gdal16plugins" ); ++ GDAL_PREFIX "/lib/gdal17plugins" ); #endif #else char szExecPath[1024]; @@ -37,7 +37,7 @@ CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" ); #else - CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" ); -+ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal16" ); ++ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal17" ); #endif #else CPLPushFinderLocation( "/usr/local/share/gdal" ); Modified: packages/gdal/branches/1.7/debian/patches/hdf4.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/hdf4.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/hdf4.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,31 +1,14 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## hdf5.dpatch by Francesco Paolo Lovergine <fran...@debian.org> +## hdf4.dpatch by Alan Boudreault <aboudrea...@mapgears.com> ## ## 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 @@ +diff -urNad gdal-1.7.1~/configure gdal-1.7.1/configure +--- gdal-1.7.1~/configure 2010-02-18 15:02:46.000000000 -0500 ++++ gdal-1.7.1/configure 2010-02-25 13:35:59.713682010 -0500 +@@ -22505,7 +22505,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 @@ -34,7 +17,7 @@ else HDF_LIB_NAME=missing fi -@@ -22384,13 +22384,13 @@ +@@ -22584,13 +22584,13 @@ if test "$HDF_LIB_NAME" = "missing" ; then unset ac_cv_lib_mfhdf_SDreaddata @@ -51,7 +34,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22446,7 +22446,7 @@ +@@ -22646,7 +22646,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 @@ -60,7 +43,7 @@ else HDF_LIB_NAME=missing fi -@@ -22455,13 +22455,13 @@ +@@ -22655,13 +22655,13 @@ if test "$HDF_LIB_NAME" = "missing" ; then unset ac_cv_lib_mfhdf_SDreaddata @@ -77,7 +60,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22517,7 +22517,7 @@ +@@ -22717,7 +22717,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 Modified: packages/gdal/branches/1.7/debian/patches/libname.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/libname.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/libname.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,68 +1,56 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## libname.dpatch by Francesco Paolo Lovergine <fran...@debian.org> +## libname.dpatch by Alan Boudreault <aboudrea...@mapgears.com> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ -diff -urNad gdal-1.6.0~/GDALmake.opt.in gdal-1.6.0/GDALmake.opt.in ---- gdal-1.6.0~/GDALmake.opt.in 2008-11-23 22:51:24.000000000 +0100 -+++ gdal-1.6.0/GDALmake.opt.in 2008-12-24 11:21:35.000000000 +0100 -@@ -82,7 +82,7 @@ +diff -urNad gdal-1.7.1~/GDALmake.opt.in gdal-1.7.1/GDALmake.opt.in +--- gdal-1.7.1~/GDALmake.opt.in 2010-02-08 14:52:34.000000000 -0500 ++++ gdal-1.7.1/GDALmake.opt.in 2010-02-18 11:08:22.123682825 -0500 +@@ -84,7 +84,7 @@ -I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts # libtool targets and help variables -LIBGDAL := libgdal.la -+LIBGDAL := libgdal1.6.0.la - LIBGDAL_CURRENT := 14 - LIBGDAL_REVISION := 0 - LIBGDAL_AGE := 13 -@@ -95,9 +95,9 @@ ++LIBGDAL := libgdal1.7.0.la + LIBGDAL_CURRENT := 15 + LIBGDAL_REVISION := 1 + LIBGDAL_AGE := 14 +@@ -97,9 +97,9 @@ GDAL_VERSION_MINOR = @GDAL_VERSION_MINOR@ GDAL_VERSION_REV = @GDAL_VERSION_REV@ -GDAL_LIB = $(GDAL_ROOT)/libgdal.a -GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) -GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal -+GDAL_LIB = $(GDAL_ROOT)/libgdal1.6.0.a -+GDAL_SLIB = $(GDAL_ROOT)/libgdal1.6.0.$(SO_EXT) -+GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal1.6.0 ++GDAL_LIB = $(GDAL_ROOT)/libgdal1.7.0.a ++GDAL_SLIB = $(GDAL_ROOT)/libgdal1.7.0.$(SO_EXT) ++GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal1.7.0 # Mac OS X Framework definition MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@ -@@ -336,9 +336,9 @@ +@@ -363,9 +363,9 @@ CONFIG_LIBS = $(GDAL_ROOT)/$(LIBGDAL) ifeq ($(MACOSX_FRAMEWORK),yes) -CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal -+CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal1.6.0 ++CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal1.7.0 else -CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal -+CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.6.0 ++CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.7.0 endif # MACOSX_FRAMEWORK EXE_DEP_LIBS = $(GDAL_ROOT)/$(LIBGDAL) -@@ -349,9 +349,9 @@ - ifeq ($(HAVE_LD_SHARED),yes) - CONFIG_LIBS = $(GDAL_SLIB_LINK) $(LIBS) - ifeq ($(MACOSX_FRAMEWORK),yes) --CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal -+CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal1.6.0 - else --CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal -+CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.6.0 - endif - EXE_DEP_LIBS = $(GDAL_SLIB) - else -diff -urNad gdal-1.6.0~/swig/perl/Makefile.PL gdal-1.6.0/swig/perl/Makefile.PL ---- gdal-1.6.0~/swig/perl/Makefile.PL 2008-10-28 12:08:30.000000000 +0100 -+++ gdal-1.6.0/swig/perl/Makefile.PL 2008-12-24 11:24:34.000000000 +0100 +diff -urNad gdal-1.7.1~/swig/perl/Makefile.PL gdal-1.7.1/swig/perl/Makefile.PL +--- gdal-1.7.1~/swig/perl/Makefile.PL 2010-02-08 14:52:22.000000000 -0500 ++++ gdal-1.7.1/swig/perl/Makefile.PL 2010-02-18 11:08:44.843685363 -0500 @@ -24,7 +24,7 @@ die "can't find gdal-config"; } open $fh, $fh or die "$fh not found!"; -$LIB .= " -lgdal "; -+$LIB .= " -lgdal1.6.0 "; ++$LIB .= " -lgdal1.7.0 "; if ($fh) { @config = <$fh>; close $fh; Modified: packages/gdal/branches/1.7/debian/patches/mrsid-plugin.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/mrsid-plugin.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/mrsid-plugin.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -5,24 +5,23 @@ ## DP: No description. @DPATCH@ -diff -urNad gdal-1.6.3~/frmts/mrsid/GNUmakefile gdal-1.6.3/frmts/mrsid/GNUmakefile ---- gdal-1.6.3~/frmts/mrsid/GNUmakefile 2009-05-08 00:52:49.000000000 -0400 -+++ gdal-1.6.3/frmts/mrsid/GNUmakefile 2009-12-01 09:12:23.800604739 -0500 -@@ -15,3 +15,11 @@ - rm -f *.o $(O_OBJ) +diff -urNad gdal-1.7.1~/frmts/mrsid/GNUmakefile gdal-1.7.1/frmts/mrsid/GNUmakefile +--- gdal-1.7.1~/frmts/mrsid/GNUmakefile 2009-05-08 00:52:49.000000000 -0400 ++++ gdal-1.7.1/frmts/mrsid/GNUmakefile 2009-12-01 09:12:23.800604739 -0500 +@@ -28,3 +28,10 @@ + # -rpath $(INST_LIB) \ + # -no-undefined -export-dynamic - install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) -+ +dist: -+ cp -r pkg libgdal-mrsid-$(GDAL_VER) -+ rm -rf libgdal-mrsid-$(GDAL_VER)/.svn -+ cp *.h libgdal-mrsid-$(GDAL_VER) -+ cp *.cpp libgdal-mrsid-$(GDAL_VER) -+ tar czvf libgdal-mrsid-$(GDAL_VER).tar.gz ./libgdal-mrsid-$(GDAL_VER) -+ rm -rf libgdal-mrsid-$(GDAL_VER) -diff -urNad gdal-1.6.3~/frmts/mrsid/pkg/Makefile.in gdal-1.6.3/frmts/mrsid/pkg/Makefile.in ---- gdal-1.6.3~/frmts/mrsid/pkg/Makefile.in 1969-12-31 19:00:00.000000000 -0500 -+++ gdal-1.6.3/frmts/mrsid/pkg/Makefile.in 2009-12-01 09:12:23.800604739 -0500 ++ cp -r pkg gdal-mrsid-$(GDAL_VER) ++ rm -rf gdal-mrsid-$(GDAL_VER)/.svn ++ cp *.h gdal-mrsid-$(GDAL_VER) ++ cp *.cpp gdal-mrsid-$(GDAL_VER) ++ tar czvf gdal-mrsid-$(GDAL_VER).tar.gz ./gdal-mrsid-$(GDAL_VER) ++ rm -rf gdal-mrsid-$(GDAL_VER) +diff -urNad gdal-1.7.1~/frmts/mrsid/pkg/Makefile.in gdal-1.7.1/frmts/mrsid/pkg/Makefile.in +--- gdal-1.7.1~/frmts/mrsid/pkg/Makefile.in 1969-12-31 19:00:00.000000000 -0500 ++++ gdal-1.7.1/frmts/mrsid/pkg/Makefile.in 2009-12-01 09:12:23.800604739 -0500 @@ -0,0 +1,36 @@ +CC = @CC@ +CXX = @CXX@ @@ -60,9 +59,9 @@ +%.o: %.cpp + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< + -diff -urNad gdal-1.6.3~/frmts/mrsid/pkg/README gdal-1.6.3/frmts/mrsid/pkg/README ---- gdal-1.6.3~/frmts/mrsid/pkg/README 1969-12-31 19:00:00.000000000 -0500 -+++ gdal-1.6.3/frmts/mrsid/pkg/README 2009-12-01 09:12:23.800604739 -0500 +diff -urNad gdal-1.7.1~/frmts/mrsid/pkg/README gdal-1.7.1/frmts/mrsid/pkg/README +--- gdal-1.7.1~/frmts/mrsid/pkg/README 1969-12-31 19:00:00.000000000 -0500 ++++ gdal-1.7.1/frmts/mrsid/pkg/README 2009-12-01 09:12:23.800604739 -0500 @@ -0,0 +1,34 @@ + Standalone MrSID Drivers for GDAL + =================================== @@ -98,9 +97,9 @@ + http://www.gdal.org/ + http://www.lizardtech.com/ + http://www.lizardtech.com/download/ -diff -urNad gdal-1.6.3~/frmts/mrsid/pkg/aclocal.m4 gdal-1.6.3/frmts/mrsid/pkg/aclocal.m4 ---- gdal-1.6.3~/frmts/mrsid/pkg/aclocal.m4 1969-12-31 19:00:00.000000000 -0500 -+++ gdal-1.6.3/frmts/mrsid/pkg/aclocal.m4 2009-12-01 09:12:23.800604739 -0500 +diff -urNad gdal-1.7.1~/frmts/mrsid/pkg/aclocal.m4 gdal-1.7.1/frmts/mrsid/pkg/aclocal.m4 +--- gdal-1.7.1~/frmts/mrsid/pkg/aclocal.m4 1969-12-31 19:00:00.000000000 -0500 ++++ gdal-1.7.1/frmts/mrsid/pkg/aclocal.m4 2009-12-01 09:12:23.800604739 -0500 @@ -0,0 +1,202 @@ +AC_DEFUN(AC_COMPILER_LOCALHACK, +[ @@ -304,9 +303,9 @@ + AC_SUBST(LD_SHARED,$LD_SHARED) + AC_SUBST(SO_EXT,$SO_EXT) +]) -diff -urNad gdal-1.6.3~/frmts/mrsid/pkg/configure gdal-1.6.3/frmts/mrsid/pkg/configure ---- gdal-1.6.3~/frmts/mrsid/pkg/configure 1969-12-31 19:00:00.000000000 -0500 -+++ gdal-1.6.3/frmts/mrsid/pkg/configure 2009-12-01 09:12:23.800604739 -0500 +diff -urNad gdal-1.7.1~/frmts/mrsid/pkg/configure gdal-1.7.1/frmts/mrsid/pkg/configure +--- gdal-1.7.1~/frmts/mrsid/pkg/configure 1969-12-31 19:00:00.000000000 -0500 ++++ gdal-1.7.1/frmts/mrsid/pkg/configure 2009-12-01 09:12:23.800604739 -0500 @@ -0,0 +1,4680 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. @@ -4988,9 +4987,9 @@ + $ac_cs_success || { (exit 1); exit 1; } +fi + -diff -urNad gdal-1.6.3~/frmts/mrsid/pkg/configure.in gdal-1.6.3/frmts/mrsid/pkg/configure.in ---- gdal-1.6.3~/frmts/mrsid/pkg/configure.in 1969-12-31 19:00:00.000000000 -0500 -+++ gdal-1.6.3/frmts/mrsid/pkg/configure.in 2009-12-01 09:12:23.800604739 -0500 +diff -urNad gdal-1.7.1~/frmts/mrsid/pkg/configure.in gdal-1.7.1/frmts/mrsid/pkg/configure.in +--- gdal-1.7.1~/frmts/mrsid/pkg/configure.in 1969-12-31 19:00:00.000000000 -0500 ++++ gdal-1.7.1/frmts/mrsid/pkg/configure.in 2009-12-01 09:12:23.800604739 -0500 @@ -0,0 +1,280 @@ +dnl *************************************************************************** +dnl $Id: configure.in 9971 2006-08-23 20:06:02Z fwarmerdam $ Modified: packages/gdal/branches/1.7/debian/patches/ogdi.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/ogdi.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/ogdi.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,14 +1,14 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## ogdi.dpatch by Francesco Paolo Lovergine <fran...@debian.org> +## ogdi.dpatch by Alan Boudreault <aboudrea...@mapgears.com> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ -diff -urNad gdal-1.4.1~/GDALmake.opt.in gdal-1.4.1/GDALmake.opt.in ---- gdal-1.4.1~/GDALmake.opt.in 2007-04-24 12:46:08.000000000 +0200 -+++ gdal-1.4.1/GDALmake.opt.in 2007-04-24 12:46:56.000000000 +0200 -@@ -275,7 +275,7 @@ +diff -urNad gdal-1.7.1~/GDALmake.opt.in gdal-1.7.1/GDALmake.opt.in +--- gdal-1.7.1~/GDALmake.opt.in 2010-02-08 14:52:34.000000000 -0500 ++++ gdal-1.7.1/GDALmake.opt.in 2010-02-18 11:35:01.244933233 -0500 +@@ -291,7 +291,7 @@ # PCRaster support PCRASTER_SETTING = @PCRASTER_SETTING@ @@ -17,36 +17,3 @@ PNG_SETTING = @PNG_SETTING@ JPEG_SETTING = @JPEG_SETTING@ -diff -urNad gdal-1.4.1~/configure gdal-1.4.1/configure ---- gdal-1.4.1~/configure 2007-04-24 12:45:54.000000000 +0200 -+++ gdal-1.4.1/configure 2007-04-24 12:46:10.000000000 +0200 -@@ -23968,7 +23968,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-logdi31 $LIBS" -+LIBS="-logdi $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24034,16 +24034,16 @@ - - - if test "$HAVE_OGDI" = "yes" ; then -- LIBS="-logdi31 $LIBS" -+ LIBS="-logdi $LIBS" - fi - - else - - HAVE_OGDI=yes -- LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi31 $LIBS" -- OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include" -+ LIBS="-logdi $LIBS" -+ OGDI_INCLUDE="-I/usr/include/ogdi" - -- echo "using libogdi31 from $with_ogdi." -+ echo "using libogdi from $with_ogdi." - - fi - Modified: packages/gdal/branches/1.7/debian/patches/python.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/python.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/python.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -13,6 +13,6 @@ #include_dirs = ../../port:../../gcore:../../alg:../../ogr/ #library_dirs = ../../.libs:../../ -#libraries = gdal -+libraries = gdal1.6.0 ++libraries = gdal1.7.0 gdal_config=../../apps/gdal-config Modified: packages/gdal/branches/1.7/debian/patches/rubymakefile.dpatch =================================================================== --- packages/gdal/branches/1.7/debian/patches/rubymakefile.dpatch 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/patches/rubymakefile.dpatch 2010-02-25 20:27:37 UTC (rev 2737) @@ -1,25 +1,25 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## rubymakefile.dpatch by Francesco Paolo Lovergine <fran...@debian.org> +## rubymakefile.dpatch by Alan Boudreault <aboudrea...@mapgears.com> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ -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 +diff -urNad gdal-1.7.1~/swig/ruby/RubyMakefile.mk gdal-1.7.1/swig/ruby/RubyMakefile.mk +--- gdal-1.7.1~/swig/ruby/RubyMakefile.mk 2010-02-08 14:52:08.000000000 -0500 ++++ gdal-1.7.1/swig/ruby/RubyMakefile.mk 2010-02-18 11:53:56.380910015 -0500 @@ -25,7 +25,9 @@ INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR) --LDFLAGS += -shared -L$(RUBY_LIB_DIR) +-LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR) +LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR) +CFLAGS += -fPIC -DPIC +CXXFLAGS += -fPIC -DPIC RUBY_LIB := -l$(RUBY_SO_NAME) build: $(RUBY_MODULES) -@@ -41,17 +43,17 @@ +@@ -40,17 +42,17 @@ $(INSTALL_DIR): mkdir -p $(DESTDIR)$(INSTALL_DIR) Modified: packages/gdal/branches/1.7/debian/rules =================================================================== --- packages/gdal/branches/1.7/debian/rules 2010-02-25 19:59:45 UTC (rev 2736) +++ packages/gdal/branches/1.7/debian/rules 2010-02-25 20:27:37 UTC (rev 2737) @@ -16,7 +16,6 @@ RUBYDEF=$(shell ruby --version|cut -d' ' -f2|cut -d. -f1,2) PERLDEF=$(shell perl -V:version|cut -d\' -f2) SWIGVER=$(shell swig -version |grep Version|cut -d' ' -f3|sed -e 's/\.//g') -SWIGOK=$(shell test $(SWIGVER) -ge 1338 && echo yes) GDALVER=$(shell cat VERSION|sed -e 's/\./ /g') GDAL_MAJOR=$(word 1,$(GDALVER)) @@ -30,11 +29,6 @@ @echo Python versions: $(PYVERS) @echo Ruby default: $(RUBYDEF) @echo Perl default: $(PERLDEF) -ifneq ($(SWIGOK),yes) - @echo Swig is not fixed for ogr.py -else - @echo Swig is fixed for ogr.py -endif @echo GDAL version: $(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH) # @@ -120,23 +114,13 @@ # It needs pre-installing just after the building due to intermediate cleaning. # Apply conditionally an on-fly patch for pre 1.3.38 swig versions. -ifneq ($(SWIGOK),yes) 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; \ - echo "Patching ogr.py" ; \ - patch $(CURDIR)/debian/python-tmp/usr/lib/python$$V/site-packages/osgeo/ogr.py $(CURDIR)/debian/ogr.py.diff; \ done -else - 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 -endif + $(MAKE) docs $(MAKE) man # a temporary workaround for doxygen problem #564243 @@ -166,7 +150,7 @@ cp `ls GDALmake.opt-*|tail -1` GDALmake.opt $(MAKE) install BINDINGS="perl ruby" DESTDIR=$(CURDIR)/debian/tmp \ - INST_DATA="\$$(prefix)/share/gdal16" + INST_DATA="\$$(prefix)/share/gdal17" $(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \ "INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\ "INST_MAN=\$$(prefix)/share/man" @@ -180,7 +164,7 @@ install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/. # removing license file - rm -f $(CURDIR)/debian/tmp/usr/share/gdal16/LICENSE.TXT + rm -f $(CURDIR)/debian/tmp/usr/share/gdal17/LICENSE.TXT # removing empty packlist MakeMaker files -find $(CURDIR)/debian/tmp/usr/local/lib/perl -type f -name .packlist -exec rm -f {} \; # removing embedded rpath in perl shlibs @@ -208,7 +192,7 @@ dh_perl dh_makeshlibs dh_installdeb - dh_shlibdeps -L libgdal1-1.6.0 -l debian/libgdal1-1.6.0/usr/lib + dh_shlibdeps -L libgdal1-1.7.0 -l debian/libgdal1-1.7.0/usr/lib dh_gencontrol dh_md5sums dh_builddeb _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
