[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 0ddca5cb9dcac702662b35d17b3a19beec19a53d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 14 00:30:11 2013 +0200

    Install python scripts without .py extension.

diff --git a/debian/changelog b/debian/changelog
index 7d9796e..81abd3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
     (closes: #722383)
   * Use minimal dh rules with dh-python, and dh-autoreconf for retooling.
   * Add patch to use hardening flags for java and perl bindings.
+  * Install python scripts without .py extension.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/python-gdal.install b/debian/python-gdal.install
index 8d1d3c9..0dac0f2 100644
--- a/debian/python-gdal.install
+++ b/debian/python-gdal.install
@@ -1,5 +1,26 @@
 usr/lib/python2*
-usr/bin/*.py
+usr/bin/epsg_tr
+usr/bin/esri2wkt
+usr/bin/gcps2vec
+usr/bin/gcps2wld
+usr/bin/gdal2tiles
+usr/bin/gdal2xyz
+usr/bin/gdalchksum
+usr/bin/gdalident
+usr/bin/gdalimport
+usr/bin/gdalmove
+usr/bin/gdal_auth
+usr/bin/gdal_calc
+usr/bin/gdal_edit
+usr/bin/gdal_fillnodata
+usr/bin/gdal_merge
+usr/bin/gdal_polygonize
+usr/bin/gdal_proximity
+usr/bin/gdal_retile
+usr/bin/gdal_sieve
+usr/bin/mkgraticule
+usr/bin/pct2rgb
+usr/bin/rgb2pct
 usr/share/man/man1/gdal_merge.1
 usr/share/man/man1/pct2rgb.1
 usr/share/man/man1/rgb2pct.1
diff --git a/debian/rules b/debian/rules
index 83bf75f..80fe146 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,7 +145,9 @@ override_dh_auto_install:
 	# install python stuff previuosly built and pre-installed
 	cp -a $(CURDIR)/debian/python-tmp/usr/lib/* $(CURDIR)/debian/tmp/usr/lib/.
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/bin
-	install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/.
+	for pyfile in $(shell find swig/python/scripts/ -name "*.py"); do \
+		install -o root -g root -m 755 $$pyfile $(CURDIR)/debian/tmp/usr/bin/`basename $$pyfile | sed 's/\.py//'`; \
+	done
 
 	# java stuff
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/java $(CURDIR)/debian/tmp/usr/lib/jni

-- 
GDAL/OGR library and tools