Author: frankie Date: 2009-03-27 15:06:59 +0000 (Fri, 27 Mar 2009) New Revision: 2089
Added: packages/gdal-grass/branches/1.5/debian/control.in packages/gdal-grass/branches/1.5/debian/patches/rpath.dpatch Removed: packages/gdal-grass/branches/1.5/debian/patches/rpath.dpatch Modified: packages/gdal-grass/branches/1.5/debian/changelog packages/gdal-grass/branches/1.5/debian/control packages/gdal-grass/branches/1.5/debian/rules Log: Updating by merge Modified: packages/gdal-grass/branches/1.5/debian/changelog =================================================================== --- packages/gdal-grass/branches/1.5/debian/changelog 2009-03-27 14:54:39 UTC (rev 2088) +++ packages/gdal-grass/branches/1.5/debian/changelog 2009-03-27 15:06:59 UTC (rev 2089) @@ -1,11 +1,12 @@ libgdal-grass (1.5.4-3) unstable; urgency=low - * Added rpath.patch to introduce explicit rpath to link current grass - specific libraries. Note that this plugin depends on both gdal and - grass specific libraries (and APIs). This is required because - grass >= 6.4~rc3 does not add its libraries path to ld.so configuration. + * Merged from 1.6 branch. + * Introduced automagically dependency on the grass version used for building. + It prevents breakages at major upgrading times. + * Policy bumped to 3.8.1 + * Minor changes to descriptions. - -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 03 Mar 2009 17:14:43 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 27 Mar 2009 15:51:56 +0100 libgdal-grass (1.5.4-2) unstable; urgency=low Modified: packages/gdal-grass/branches/1.5/debian/control =================================================================== --- packages/gdal-grass/branches/1.5/debian/control 2009-03-27 14:54:39 UTC (rev 2088) +++ packages/gdal-grass/branches/1.5/debian/control 2009-03-27 15:06:59 UTC (rev 2089) @@ -3,9 +3,9 @@ Priority: extra Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 7), d-shlibs, libgdal1-dev (>=1.5.0), +Build-Depends: debhelper (>= 7), d-shlibs, libgdal1-dev (>= 1.5.0), pkg-config grass-dev (>= 6.4.0~rc3), grass (>= 6.4.0~rc3), dpatch -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://www.gdal.org/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gdal-grass/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gdal-grass/trunk @@ -13,10 +13,10 @@ Package: libgdal1-1.5.0-grass Section: libs Architecture: any -Depends: ${shlibs:Depends}, grass (>= 6.4.0~rc3) -Recommends: -Description: GRASS extension for the Geospatial Data Abstraction Library +Depends: ${shlibs:Depends}, grass64 +Recommends: gdal-bin +Description: GRASS extension for the GDAL library GDAL is a translator library for raster geospatial data formats. As a library, it presents a single abstract data model to the calling application for all supported formats. This extension - provides access to GRASS raster data via GDAL. + provides access to GRASS data via GDAL. Copied: packages/gdal-grass/branches/1.5/debian/control.in (from rev 2088, packages/gdal-grass/trunk/debian/control.in) =================================================================== --- packages/gdal-grass/branches/1.5/debian/control.in (rev 0) +++ packages/gdal-grass/branches/1.5/debian/control.in 2009-03-27 15:06:59 UTC (rev 2089) @@ -0,0 +1,22 @@ +Source: libgdal-grass +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 (>= 7), d-shlibs, libgdal1-dev (>= 1.5.0), pkg-config + grass-dev (>= 6.4.0~rc3), grass (>= 6.4.0~rc3), dpatch +Standards-Version: 3.8.1 +Homepage: http://www.gdal.org/ +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gdal-grass/trunk +Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gdal-grass/trunk + +Package: libgdal1-1.5.0-grass +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, @GRASS@ +Recommends: gdal-bin +Description: GRASS extension for the GDAL library + GDAL is a translator library for raster geospatial data formats. + As a library, it presents a single abstract data model to the + calling application for all supported formats. This extension + provides access to GRASS data via GDAL. Deleted: packages/gdal-grass/branches/1.5/debian/patches/rpath.dpatch =================================================================== --- packages/gdal-grass/branches/1.5/debian/patches/rpath.dpatch 2009-03-27 14:54:39 UTC (rev 2088) +++ packages/gdal-grass/branches/1.5/debian/patches/rpath.dpatch 2009-03-27 15:06:59 UTC (rev 2089) @@ -1,23 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## rpath.dpatch by Francesco Paolo Lovergine <fran...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -...@dpatch@ -diff -urNad libgdal-grass-1.5.4~/Makefile.in libgdal-grass-1.5.4/Makefile.in ---- libgdal-grass-1.5.4~/Makefile.in 2009-02-23 14:50:50.000000000 +0100 -+++ libgdal-grass-1.5.4/Makefile.in 2009-03-03 17:20:39.000000000 +0100 -@@ -42,10 +42,10 @@ - - - $(GLIBNAME): grass57dataset.o -- $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) -+ $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib - - $(OLIBNAME): ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o -- $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -+ $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib - - %.o: %.cpp - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< Copied: packages/gdal-grass/branches/1.5/debian/patches/rpath.dpatch (from rev 2088, packages/gdal-grass/trunk/debian/patches/rpath.dpatch) =================================================================== --- packages/gdal-grass/branches/1.5/debian/patches/rpath.dpatch (rev 0) +++ packages/gdal-grass/branches/1.5/debian/patches/rpath.dpatch 2009-03-27 15:06:59 UTC (rev 2089) @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## rpath.dpatch by Francesco Paolo Lovergine <fran...@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add grass rpath at linking time. + +...@dpatch@ +diff -urNad libgdal-grass-1.5.4~/Makefile.in libgdal-grass-1.5.4/Makefile.in +--- libgdal-grass-1.5.4~/Makefile.in 2009-02-23 14:50:50.000000000 +0100 ++++ libgdal-grass-1.5.4/Makefile.in 2009-03-03 17:20:39.000000000 +0100 +@@ -42,10 +42,10 @@ + + + $(GLIBNAME): grass57dataset.o +- $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) ++ $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib + + $(OLIBNAME): ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o +- $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) ++ $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib + + %.o: %.cpp + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< Modified: packages/gdal-grass/branches/1.5/debian/rules =================================================================== --- packages/gdal-grass/branches/1.5/debian/rules 2009-03-27 14:54:39 UTC (rev 2088) +++ packages/gdal-grass/branches/1.5/debian/rules 2009-03-27 15:06:59 UTC (rev 2089) @@ -7,14 +7,19 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export PKGNAME=libgdal1-1.5.0-grass +PKGNAME=$(shell grep Package: debian/control|cut -d' ' -f2) +GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2)) +GDAL=gdal$(subst .,,$(shell gdal-config --version|cut -d. -f1,2)) include /usr/share/dpatch/dpatch.make +debian/control: debian/control.in + sed -e 's/@GRASS@/$(GRASS)/' $< >$@ + config.status: dh_testdir - ./configure --prefix=/usr --with-grass=/usr/lib/grass64 --with-autoload=/usr/lib/gdal15plugins + ./configure --prefix=/usr --with-grass=/usr/lib/$(GRASS) --with-autoload=/usr/lib/$(GDAL)plugins build: build-stamp build-stamp: patch config.status @@ -24,7 +29,7 @@ touch build-stamp -clean: unpatch +clean: debian/control unpatch dh_testdir dh_testroot @@ -38,11 +43,11 @@ dh_prep dh_installdirs - mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15/grass - $(MAKE) install AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15plugins \ - GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15/grass + mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass + $(MAKE) install AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)plugins \ + GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass # removes redundant stuff already installed by grass - rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15 + rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL) binary-indep: build install # Do nothing @@ -58,10 +63,11 @@ dh_fixperms dh_makeshlibs dh_installdeb - dh_shlibdeps -l.:/usr/lib/grass64/lib + dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib dh_gencontrol dh_md5sums dh_builddeb binary: binary-arch binary-indep + .PHONY: build clean binary-arch binary-indep binary install _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
