This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository gdal.
commit 3fd993a712937d302c738fa203196399f8f43657 Author: Bas Couwenberg <[email protected]> Date: Tue Apr 1 23:49:17 2014 +0200 Don't strip .py extension from python scripts, breaks QGIS plugins. --- debian/changelog | 1 + debian/python-gdal.install | 23 +---------------------- debian/python-gdal.lintian-overrides | 3 +++ debian/rules | 4 +--- 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8447e40..94159c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ gdal (1.10.1+dfsg-5) unstable; urgency=low * Don't run dh for custom targets. * Also remove config.log on clean. + * Don't strip .py extension from python scripts, breaks QGIS plugins. -- Bas Couwenberg <[email protected]> Sun, 16 Mar 2014 10:12:39 +0100 diff --git a/debian/python-gdal.install b/debian/python-gdal.install index e62fdc9..c3c3f59 100644 --- a/debian/python-gdal.install +++ b/debian/python-gdal.install @@ -1,26 +1,5 @@ usr/lib/python2* -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/bin/*.py usr/share/doc/python-gdal/examples/ usr/share/man/man1/gdal2tiles.1 usr/share/man/man1/gdalmove.1 diff --git a/debian/python-gdal.lintian-overrides b/debian/python-gdal.lintian-overrides index 431c4b6..5282016 100644 --- a/debian/python-gdal.lintian-overrides +++ b/debian/python-gdal.lintian-overrides @@ -1,3 +1,6 @@ # Man pages are automatically generated with sphinx. python-gdal: hyphen-used-as-minus-sign python-gdal: binary-without-manpage + +# QGIS plugins rely on .py extension, see: http://hub.qgis.org/issues/9924 +python-gdal: script-with-language-extension usr/bin/*.py diff --git a/debian/rules b/debian/rules index 5cb51b4..581b161 100755 --- a/debian/rules +++ b/debian/rules @@ -151,9 +151,7 @@ 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 - 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 + install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/. # java stuff mkdir -p $(CURDIR)/debian/tmp/usr/share/java $(CURDIR)/debian/tmp/usr/lib/jni -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
