Author: frankie
Date: 2008-03-14 13:47:03 +0000 (Fri, 14 Mar 2008)
New Revision: 1404
Modified:
packages/gdal/trunk/debian/TODO
packages/gdal/trunk/debian/changelog
packages/gdal/trunk/debian/patches/gcc43.dpatch
packages/gdal/trunk/debian/rules
Log:
Fixating #462709
Modified: packages/gdal/trunk/debian/TODO
===================================================================
--- packages/gdal/trunk/debian/TODO 2008-03-13 11:01:27 UTC (rev 1403)
+++ packages/gdal/trunk/debian/TODO 2008-03-14 13:47:03 UTC (rev 1404)
@@ -6,8 +6,4 @@
to be checked as well. I would avoid both PHP and Java bindings because not
yet
mature.
-* Python bindings should move to Swig (aka ng-python binding) but that requires
- building style changes for sure. Still not suggested before 1.5.
-
- -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Sat, 06 Oct 2007 10:34:38
+0200
-
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Fri Mar 14 14:34:05 CET 2008
Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog 2008-03-13 11:01:27 UTC (rev
1403)
+++ packages/gdal/trunk/debian/changelog 2008-03-14 13:47:03 UTC (rev
1404)
@@ -1,10 +1,11 @@
gdal (1.5.0-4) UNRELEASED; urgency=low
- * NOT RELEASED YET
* Fixed removing of .info file in python-central area
- * Fixed gcc43.dpatch to add climits inclusion
+ * Fixed gcc43.dpatch to manage namespace issue. This is not accepted
upstream.
+ (closes: #462709)
+ * Updated debian/TODO.
- -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Mon, 04 Feb 2008 14:42:51
+0100
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Fri, 14 Mar 2008 14:35:18
+0100
gdal (1.5.0-3) unstable; urgency=low
Modified: packages/gdal/trunk/debian/patches/gcc43.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/gcc43.dpatch 2008-03-13 11:01:27 UTC
(rev 1403)
+++ packages/gdal/trunk/debian/patches/gcc43.dpatch 2008-03-14 13:47:03 UTC
(rev 1404)
@@ -6,9 +6,18 @@
@DPATCH@
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 2007-08-02 23:14:09.000000000
+0200
-+++ gdal-1.5.0/frmts/ilwis/ilwisdataset.cpp 2008-01-31 12:55:42.000000000
+0100
-@@ -406,7 +406,6 @@
+--- 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());
@@ -16,7 +25,7 @@
if( EQUAL(st.c_str(),"byte"))
{
-@@ -482,8 +481,6 @@
+@@ -482,8 +483,6 @@
else
georef = ReadElement("MapList", "GeoRef", osFileName);
@@ -25,7 +34,7 @@
//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 +785,6 @@
+@@ -788,7 +787,6 @@
// Fetch coordinate system
string csy = ReadElement("GeoRef", "CoordSystem", pszGeoRef);
@@ -33,7 +42,7 @@
string pszProj;
if( (csy.length() != 0) && !EQUAL(csy.c_str(),"unknown.csy"))
-@@ -1318,7 +1314,6 @@
+@@ -1318,7 +1316,6 @@
{
string domName = ReadElement("BaseMap", "Domain", pszFileName.c_str());
string pszBaseName = string(CPLGetBasename( domName.c_str() ));
@@ -41,7 +50,7 @@
string pszPath = string(CPLGetPath( pszFileName.c_str() ));
if (GetStoreType(pszFileName, psInfo.stStoreType) != CE_None)
-@@ -1370,7 +1365,6 @@
+@@ -1370,7 +1367,6 @@
pszDomainName =
string(CPLFormFilename(pszPath.c_str(),pszBaseName.c_str(),"dom" ));
string domType = ReadElement("Domain", "Type", pszDomainName.c_str());
Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules 2008-03-13 11:01:27 UTC (rev 1403)
+++ packages/gdal/trunk/debian/rules 2008-03-14 13:47:03 UTC (rev 1404)
@@ -129,7 +129,7 @@
dh_compress
dh_fixperms
dh_pycentral -X.info
- rm -f
$(CURDIR)/debian/tmp/usr/share/pycentral/python-gdal/site-packages/GDAL-1.5.0.egg-info
+ rm -f
$(CURDIR)/debian/python-gdal/usr/share/pycentral/python-gdal/site-packages/GDAL-1.5.0.egg-info
dh_perl
dh_makeshlibs
dh_installdeb
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
