Author: frankie
Date: 2008-03-26 13:32:47 +0000 (Wed, 26 Mar 2008)
New Revision: 1450
Removed:
packages/gdal/trunk/debian/patches/gcc43.dpatch
packages/gdal/trunk/debian/patches/swig.dpatch
Modified:
packages/gdal/trunk/debian/changelog
packages/gdal/trunk/debian/patches/00list
packages/gdal/trunk/debian/patches/libname.dpatch
Log:
Fixating patchset
Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog 2008-03-26 13:20:28 UTC (rev
1449)
+++ packages/gdal/trunk/debian/changelog 2008-03-26 13:32:47 UTC (rev
1450)
@@ -2,8 +2,10 @@
* (NOT RELEASED YET) New upstream release
* Moved build-dep libcurl-dev -> libcurl3-dev in debian/control for etch
backports.
+ * Patch swig.dpatch removed (merged upstream).
+ * Patch gcc32.dpatch removed (merged upstream).
- -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Wed, 26 Mar 2008 14:19:27
+0100
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Wed, 26 Mar 2008 14:31:31
+0100
gdal (1.5.0-4) unstable; urgency=low
Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list 2008-03-26 13:20:28 UTC (rev
1449)
+++ packages/gdal/trunk/debian/patches/00list 2008-03-26 13:32:47 UTC (rev
1450)
@@ -1,7 +1,5 @@
libname
ogdi
-swig
doc
rubymakefile
man
-gcc43
Deleted: packages/gdal/trunk/debian/patches/gcc43.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/gcc43.dpatch 2008-03-26 13:20:28 UTC
(rev 1449)
+++ packages/gdal/trunk/debian/patches/gcc43.dpatch 2008-03-26 13:32:47 UTC
(rev 1450)
@@ -1,71 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc43.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.0~/frmts/ilwis/ilwisdataset.cpp
gdal-1.5.0/frmts/ilwis/ilwisdataset.cpp
---- gdal-1.5.0~/frmts/ilwis/ilwisdataset.cpp 2008-02-04 14:44:48.000000000
+0100
-+++ gdal-1.5.0/frmts/ilwis/ilwisdataset.cpp 2008-02-04 14:47:03.000000000
+0100
-@@ -31,6 +31,8 @@
- #include <float.h>
- #include <climits>
-
-+using namespace std;
-+
- // IniFile.cpp: implementation of the IniFile class.
- //
- //////////////////////////////////////////////////////////////////////
-@@ -406,7 +408,6 @@
- static CPLErr GetStoreType(string pszFileName, ilwisStoreType &stStoreType)
- {
- string st = ReadElement("MapStore", "Type", pszFileName.c_str());
-- transform(st.begin(), st.end(), st.begin(), tolower);
-
- if( EQUAL(st.c_str(),"byte"))
- {
-@@ -482,8 +483,6 @@
- else
- georef = ReadElement("MapList", "GeoRef", osFileName);
-
-- transform(georef.begin(), georef.end(), georef.begin(), tolower);
--
- //Capture the geotransform, only if the georef is not 'none',
- //otherwise, the default transform should be returned.
- if( (georef.length() != 0) && !EQUAL(georef.c_str(),"none"))
-@@ -788,7 +787,6 @@
-
- // Fetch coordinate system
- string csy = ReadElement("GeoRef", "CoordSystem", pszGeoRef);
-- transform(csy.begin(), csy.end(), csy.begin(), tolower);
-
- string pszProj;
- if( (csy.length() != 0) && !EQUAL(csy.c_str(),"unknown.csy"))
-@@ -1318,7 +1316,6 @@
- {
- string domName = ReadElement("BaseMap", "Domain", pszFileName.c_str());
- string pszBaseName = string(CPLGetBasename( domName.c_str() ));
-- transform(pszBaseName.begin(), pszBaseName.end(), pszBaseName.begin(),
tolower);
- string pszPath = string(CPLGetPath( pszFileName.c_str() ));
-
- if (GetStoreType(pszFileName, psInfo.stStoreType) != CE_None)
-@@ -1370,7 +1367,6 @@
- pszDomainName =
string(CPLFormFilename(pszPath.c_str(),pszBaseName.c_str(),"dom" ));
-
- string domType = ReadElement("Domain", "Type", pszDomainName.c_str());
-- transform(domType.begin(), domType.end(), domType.begin(), tolower);
- if EQUAL(domType.c_str(),"domainvalue")
- {
- if (psInfo.stStoreType == stFloat)
-diff -urNad gdal-1.5.0~/frmts/idrisi/IdrisiDataset.cpp
gdal-1.5.0/frmts/idrisi/IdrisiDataset.cpp
---- gdal-1.5.0~/frmts/idrisi/IdrisiDataset.cpp 2007-11-20 22:01:46.000000000
+0100
-+++ gdal-1.5.0/frmts/idrisi/IdrisiDataset.cpp 2008-02-04 15:29:10.000000000
+0100
-@@ -35,6 +35,7 @@
- #include "gdal_pam.h"
- #include "gdal_rat.h"
- #include "gdal_alg.h"
-+#include <climits>
-
- CPL_CVSID( "$Id: IdrisiDataset.cpp 12896 2007-11-20 21:01:46Z rouault $" );
-
Modified: packages/gdal/trunk/debian/patches/libname.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/libname.dpatch 2008-03-26 13:20:28 UTC
(rev 1449)
+++ packages/gdal/trunk/debian/patches/libname.dpatch 2008-03-26 13:32:47 UTC
(rev 1450)
@@ -5,19 +5,19 @@
## DP: No description.
@DPATCH@
-diff -urNad gdal-1.5.0~/GDALmake.opt.in gdal-1.5.0/GDALmake.opt.in
---- gdal-1.5.0~/GDALmake.opt.in 2008-01-29 13:05:45.000000000 +0100
-+++ gdal-1.5.0/GDALmake.opt.in 2008-01-29 13:06:08.000000000 +0100
-@@ -80,7 +80,7 @@
+diff -urNad gdal-1.5.1~/GDALmake.opt.in gdal-1.5.1/GDALmake.opt.in
+--- gdal-1.5.1~/GDALmake.opt.in 2008-03-26 14:22:16.000000000 +0100
++++ gdal-1.5.1/GDALmake.opt.in 2008-03-26 14:22:31.000000000 +0100
+@@ -81,7 +81,7 @@
-I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts
# libtool targets and help variables
-LIBGDAL := libgdal.la
+LIBGDAL := libgdal1.5.0.la
LIBGDAL_CURRENT := 13
- LIBGDAL_REVISION := 0
+ LIBGDAL_REVISION := 1
LIBGDAL_AGE := 12
-@@ -93,9 +93,9 @@
+@@ -94,9 +94,9 @@
GDAL_VERSION_MINOR = @GDAL_VERSION_MINOR@
GDAL_VERSION_REV = @GDAL_VERSION_REV@
@@ -30,7 +30,7 @@
# Mac OS X Framework definition
MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
-@@ -320,9 +320,9 @@
+@@ -323,9 +323,9 @@
ifeq ($(HAVE_LIBTOOL), yes)
CONFIG_LIBS = $(GDAL_ROOT)/$(LIBGDAL)
ifeq ($(MACOSX_FRAMEWORK),yes)
@@ -42,7 +42,7 @@
endif
EXE_DEP_LIBS = $(GDAL_ROOT)/$(LIBGDAL)
SO_EXT = la
-@@ -331,9 +331,9 @@
+@@ -334,9 +334,9 @@
ifeq ($(HAVE_LD_SHARED),yes)
CONFIG_LIBS = $(GDAL_SLIB_LINK) $(LIBS)
ifeq ($(MACOSX_FRAMEWORK),yes)
@@ -54,9 +54,9 @@
endif
EXE_DEP_LIBS = $(GDAL_SLIB)
else
-diff -urNad gdal-1.5.0~/swig/perl/Makefile.PL gdal-1.5.0/swig/perl/Makefile.PL
---- gdal-1.5.0~/swig/perl/Makefile.PL 2008-01-29 13:05:45.000000000 +0100
-+++ gdal-1.5.0/swig/perl/Makefile.PL 2008-01-29 13:06:08.000000000 +0100
+diff -urNad gdal-1.5.1~/swig/perl/Makefile.PL gdal-1.5.1/swig/perl/Makefile.PL
+--- gdal-1.5.1~/swig/perl/Makefile.PL 2008-03-26 14:22:16.000000000 +0100
++++ gdal-1.5.1/swig/perl/Makefile.PL 2008-03-26 14:22:31.000000000 +0100
@@ -2,7 +2,7 @@
$libdir = $ENV{'PREFIX'} ? "-L$ENV{'PREFIX'}/lib" : '';
@@ -66,15 +66,15 @@
# for old-style, use gdal, gdalconst,ogr, and osr as keys
-diff -urNad gdal-1.5.0~/swig/python/setup.cfg gdal-1.5.0/swig/python/setup.cfg
---- gdal-1.5.0~/swig/python/setup.cfg 2007-11-24 06:59:53.000000000 +0100
-+++ gdal-1.5.0/swig/python/setup.cfg 2008-01-29 13:06:28.000000000 +0100
+diff -urNad gdal-1.5.1~/swig/python/setup.cfg gdal-1.5.1/swig/python/setup.cfg
+--- gdal-1.5.1~/swig/python/setup.cfg 2008-03-26 14:22:16.000000000 +0100
++++ gdal-1.5.1/swig/python/setup.cfg 2008-03-26 14:24:35.000000000 +0100
@@ -1,7 +1,7 @@
[build_ext]
- include_dirs =
../../port:../../gcore:../../alg:../../ogr/:/usr/local/include:/usr/include
- library_dirs = ../../.libs:../../:/usr/local/lib:/usr/lib
+ include-dirs =
../../port:../../gcore:../../alg:../../ogr/:/usr/local/include:/usr/include
+ library-dirs = ../../.libs:../../:/usr/local/lib:/usr/lib
-libraries = gdal
+libraries = gdal1.5.0
- gdal_config=../../apps/gdal-config
+ gdal_config=gdal-config
# setup.cfg settings for building on win32 with msvc
Deleted: packages/gdal/trunk/debian/patches/swig.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/swig.dpatch 2008-03-26 13:20:28 UTC
(rev 1449)
+++ packages/gdal/trunk/debian/patches/swig.dpatch 2008-03-26 13:32:47 UTC
(rev 1450)
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## swig.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.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}
-
- build:
-- python setup.py build
-+ ${PYTHON} setup.py build
-
- 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
