[SCM] gdal branch, master, updated. upstream/1.8.0-27-g4128d64

[Aron Xu]

The following commit has been merged in the master branch:
commit 4128d640badf54e8b9d185f332204f82a6150954
Author: Aron Xu <aron at debian.org>
Date:   Thu Jul 14 02:32:41 2011 +0800

    Transitions: libjpeg-dev, dh_python2; more modifications: libpng-dev.

diff --git a/debian/changelog b/debian/changelog
index 0ce5fd5..07c26f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gdal (1.8.0-2) UNRELEASED; urgency=low
+
+  * Really use libjpeg-dev to in favor of libjpeg8 transition.
+    (Closes: #629964)
+  * Build-Depends on libpng-dev instead of libpng12-dev.
+  * Transition to dh_python2. (Closes: #616821)
+
+ -- Aron Xu <aron at debian.org>  Thu, 14 Jul 2011 02:30:52 +0800
+
 gdal (1.8.0-2) experimental; urgency=low
 
   * Patch: symver. Added symbol versioning (GDAL_X.Y) for all symbols 
diff --git a/debian/control b/debian/control
index 9a85b3d..a9ab652 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0),
- libjasper-dev, libpng12-dev, libjpeg-dev, libgif-dev,
+ libjasper-dev, libpng-dev, libjpeg-dev, libgif-dev,
  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, libmysqlclient-dev, python-all-dev (>= 2.3.5-11~), 
- python-central (>= 0.5), libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
+ python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev, python-all-dev (>= 2.6.6-3~), 
+ libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
  ruby, ruby1.8-dev, chrpath, swig, libtool (>= 1.5.24-2), patch, libexpat1-dev, libproj-dev,
  libdap-dev, libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4), libepsilon-dev (>= 0.9.1)
 Build-Conflicts: python-setuptools
@@ -45,7 +45,7 @@ Package: libgdal1-dev
 Section: libdevel
 Architecture: any
 Depends: libgdal1-1.8.0 (=${binary:Version}), libc6-dev, libnetcdf-dev, 
- libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg-dev, libgif-dev, libhdf4-alt-dev, 
+ libjasper-dev|libjasper-1.701-dev, libpng-dev, libjpeg-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,
  libspatialite-dev, libdap-dev, ${misc:Depends}
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/rules b/debian/rules
index 4d3f2f3..a6794bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,7 +186,7 @@ binary-common:
 	dh_compress
 	dh_fixperms
 	#find $(CURDIR)/debian/python-gdal -name GDAL-$(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH).egg-info -delete || true
-	dh_pycentral -X.info
+	dh_python2 -X.info
 	dh_perl
 	dh_makeshlibs
 	dh_installdeb

-- 
GDAL/OGR library and tools