[SCM] gdal-grass branch, master, updated. upstream/1.7.3-10-g9ad44e8
The following commit has been merged in the master branch: commit 35da16a05047ae37b9af53ef8f0d19921542feb4 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Feb 25 11:56:32 2011 +0100 Now using a strict build-dep for safety. diff --git a/debian/changelog b/debian/changelog index 849256a..81d5406 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libgdal-grass (1.7.3-2) unstable; urgency=low + + * Introduced a strict build-dep on libgdal1-dev to use the new path +for plugins and avoid problems in building. +The same strict dependency should be present in libgdal1-1.7.0, +but the -1 version never landed in testing so it is pointless. + + -- Francesco Paolo Lovergine fran...@debian.org Fri, 25 Feb 2011 11:55:10 +0100 + libgdal-grass (1.7.3-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 434da50..fbf0947 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: science Priority: extra Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -Build-Depends: debhelper (= 8), d-shlibs, libgdal1-dev (= 1.7.0), pkg-config, grass-dev (= 6.4.0~rc5), +Build-Depends: debhelper (= 8), d-shlibs, libgdal1-dev (= 1.7.0-2~), pkg-config, grass-dev (= 6.4.0~rc5), grass (= 6.4.0~rc5), libproj-dev Standards-Version: 3.9.1 Homepage: http://www.gdal.org/ diff --git a/debian/control.in b/debian/control.in index 58aea7b..fbbc029 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: science Priority: extra Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -Build-Depends: debhelper (= 8), d-shlibs, libgdal1-dev (= 1.7.0), pkg-config, grass-dev (= 6.4.0~rc5), +Build-Depends: debhelper (= 8), d-shlibs, libgdal1-dev (= 1.7.0-2~), pkg-config, grass-dev (= 6.4.0~rc5), grass (= 6.4.0~rc5), libproj-dev Standards-Version: 3.9.1 Homepage: http://www.gdal.org/ -- GRASS extension for the GDAL library ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] gdal-grass branch, master, updated. upstream/1.7.3-10-g9ad44e8
The following commit has been merged in the master branch: commit e4558013a142f3d3e270b1daacb3e5400f64d731 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Feb 25 12:19:12 2011 +0100 Still other changes for the new plugins path. diff --git a/debian/changelog b/debian/changelog index 81d5406..5c8e6f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libgdal-grass (1.7.3-2) unstable; urgency=low for plugins and avoid problems in building. The same strict dependency should be present in libgdal1-1.7.0, but the -1 version never landed in testing so it is pointless. + * Fixed debian/rules to use the new path for plugins. -- Francesco Paolo Lovergine fran...@debian.org Fri, 25 Feb 2011 11:55:10 +0100 diff --git a/debian/lintian-overrides.in b/debian/lintian-overrides.in index 9cf19ae..7431299 100644 --- a/debian/lintian-overrides.in +++ b/debian/lintian-overrides.in @@ -1,3 +1,3 @@ # The run path has been added to get Grass internal library -@PKGNAME@: binary-or-shlib-defines-rpath ./usr/lib/@GDAL@plugins/gdal_GRASS.so /usr/lib/@GRASS@/lib -@PKGNAME@: binary-or-shlib-defines-rpath ./usr/lib/@GDAL@plugins/ogr_GRASS.so /usr/lib/@GRASS@/lib +@PKGNAME@: binary-or-shlib-defines-rpath ./usr/lib/gdalplugins/@GDAL@/gdal_GRASS.so /usr/lib/@GRASS@/lib +@PKGNAME@: binary-or-shlib-defines-rpath ./usr/lib/gdalplugins/@GDAL@/ogr_GRASS.so /usr/lib/@GRASS@/lib diff --git a/debian/rules b/debian/rules index a532eee..1510fd8 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ PKGNAME=$(shell grep Package: debian/control.in|cut -d' ' -f2) GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2)) GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2,3|sed -e 's/RC/-/')) -GDAL=gdal$(subst .,,$(shell cat VERSION|cut -d. -f1,2)) +GDAL=$(shell cat VERSION|cut -d. -f1,2) # Abort if source and gdal have not the same versions. ifneq ($(shell gdal-config --version),$(shell cat VERSION)) @@ -32,7 +32,7 @@ config.status: debian/control lintian-overrides if [ `grep $(GRASS_ABI) debian/control|wc -l` -eq 0 ]; then \ sed -e 's/@GRASS_ABI@/$(GRASS_ABI)/' debian/control.in debian/control; \ fi - ./configure --prefix=/usr --with-grass=/usr/lib/$(GRASS) --with-autoload=/usr/lib/$(GDAL)plugins + ./configure --prefix=/usr --with-grass=/usr/lib/$(GRASS) --with-autoload=/usr/lib/gdalplugins/$(GDAL) build: build-stamp build-stamp: config.status @@ -57,7 +57,7 @@ install: build dh_installdirs mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass - $(MAKE) install AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)plugins \ + $(MAKE) install AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins/$(GDAL) \ GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass # removes redundant stuff already installed by grass rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL) -- GRASS extension for the GDAL library ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] gdal-grass branch, master, updated. upstream/1.7.3-10-g9ad44e8
The following commit has been merged in the master branch: commit 9ad44e8ae20b49b05ee3a54db05291c7d32a505e Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Feb 25 12:20:55 2011 +0100 Template result. diff --git a/debian/libgdal1-1.7.0-grass.lintian-overrides b/debian/libgdal1-1.7.0-grass.lintian-overrides index 331deda..33a8f4d 100644 --- a/debian/libgdal1-1.7.0-grass.lintian-overrides +++ b/debian/libgdal1-1.7.0-grass.lintian-overrides @@ -1,3 +1,3 @@ # The run path has been added to get Grass internal library -libgdal1-1.7.0-grass: binary-or-shlib-defines-rpath ./usr/lib/gdal17plugins/gdal_GRASS.so /usr/lib/grass64/lib -libgdal1-1.7.0-grass: binary-or-shlib-defines-rpath ./usr/lib/gdal17plugins/ogr_GRASS.so /usr/lib/grass64/lib +libgdal1-1.7.0-grass: binary-or-shlib-defines-rpath ./usr/lib/gdalplugins/1.7/gdal_GRASS.so /usr/lib/grass64/lib +libgdal1-1.7.0-grass: binary-or-shlib-defines-rpath ./usr/lib/gdalplugins/1.7/ogr_GRASS.so /usr/lib/grass64/lib -- GRASS extension for the GDAL library ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
