[DebianGIS-dev] r1459 - in packages/gdal-grass/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Thu Mar 27 14:03:05 UTC 2008
Author: frankie
Date: 2008-03-27 14:03:04 +0000 (Thu, 27 Mar 2008)
New Revision: 1459
Added:
packages/gdal-grass/trunk/debian/patches/
packages/gdal-grass/trunk/debian/patches/00list
packages/gdal-grass/trunk/debian/patches/path.dpatch
Modified:
packages/gdal-grass/trunk/debian/changelog
packages/gdal-grass/trunk/debian/control
packages/gdal-grass/trunk/debian/rules
Log:
Finalizing fixes for release.
Modified: packages/gdal-grass/trunk/debian/changelog
===================================================================
--- packages/gdal-grass/trunk/debian/changelog 2008-03-27 13:42:56 UTC (rev 1458)
+++ packages/gdal-grass/trunk/debian/changelog 2008-03-27 14:03:04 UTC (rev 1459)
@@ -6,8 +6,12 @@
* [Lintian] Do a make distclean on clean only when Makefile exists.
* Moved arch-dependent files into /usr/lib/gdal15/grass.
* Now using /usr/lib/gdal15plugins for shared libs.
+ * Added dpatch support.
+ * Added patch path.dpatch to fix embedded gdal-grass path.
+ * Fixed targets in debian/rules.
+ * Added grass libs path to dh_shlibs call in debian/rules.
- -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 27 Mar 2008 14:41:16 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 27 Mar 2008 14:56:34 +0100
libgdal-grass (1.4.4-1) unstable; urgency=low
Modified: packages/gdal-grass/trunk/debian/control
===================================================================
--- packages/gdal-grass/trunk/debian/control 2008-03-27 13:42:56 UTC (rev 1458)
+++ packages/gdal-grass/trunk/debian/control 2008-03-27 14:03:04 UTC (rev 1459)
@@ -3,7 +3,8 @@
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 (>>5.0.0), d-shlibs, libgdal1-dev (>=1.4.1) | libgdal1-1.3.2-dev, grass-dev (>= 6.0.2-5), grass (>= 6.0.2-5)
+Build-Depends: debhelper (>>5.0.0), d-shlibs, libgdal1-dev (>=1.4.1) | libgdal1-1.3.2-dev,
+ grass-dev (>= 6.0.2-5), grass (>= 6.0.2-5), dpatch
Standards-Version: 3.7.3
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
Added: packages/gdal-grass/trunk/debian/patches/00list
===================================================================
--- packages/gdal-grass/trunk/debian/patches/00list (rev 0)
+++ packages/gdal-grass/trunk/debian/patches/00list 2008-03-27 14:03:04 UTC (rev 1459)
@@ -0,0 +1 @@
+path
Added: packages/gdal-grass/trunk/debian/patches/path.dpatch
===================================================================
--- packages/gdal-grass/trunk/debian/patches/path.dpatch (rev 0)
+++ packages/gdal-grass/trunk/debian/patches/path.dpatch 2008-03-27 14:03:04 UTC (rev 1459)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## path.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gdal-grass-1.5.1~/grass57dataset.cpp gdal-grass-1.5.1/grass57dataset.cpp
+--- gdal-grass-1.5.1~/grass57dataset.cpp 2008-03-27 13:57:23.000000000 +0100
++++ gdal-grass-1.5.1/grass57dataset.cpp 2008-03-27 14:54:48.000000000 +0100
+@@ -825,7 +825,7 @@
+ if ( !getenv( "GISBASE" ) ) {
+ // we are outside a GRASS session
+ // TODO: use function instead of hardcoded path
+- sprintf(fake_gisbase, "GISBASE=/usr/local/share/gdal/grass/" );
++ sprintf(fake_gisbase, "GISBASE=/usr/lib/gdal15/grass/" );
+ putenv( fake_gisbase );
+ hasGisbase = false;
+ } else {
Property changes on: packages/gdal-grass/trunk/debian/patches/path.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/gdal-grass/trunk/debian/rules
===================================================================
--- packages/gdal-grass/trunk/debian/rules 2008-03-27 13:42:56 UTC (rev 1458)
+++ packages/gdal-grass/trunk/debian/rules 2008-03-27 14:03:04 UTC (rev 1459)
@@ -9,27 +9,28 @@
export PKGNAME=libgdal1-1.5.0-grass
-config.status:
+include /usr/share/dpatch/dpatch.make
+
+config.status:
dh_testdir
./configure --prefix=/usr --with-grass=/usr/lib/grass --with-autoload=/usr/lib/gdal15plugins
build: build-stamp
-build-stamp: config.status
+build-stamp: patch config.status
dh_testdir
$(MAKE)
touch build-stamp
-clean:
-
+clean: unpatch
dh_testdir
dh_testroot
[ ! -f $(CURDIR)/Makefile ] || $(MAKE) distclean
- dh_clean build-stamp configure-stamp
+ dh_clean build-stamp config.status
install: build
dh_testdir
@@ -54,7 +55,7 @@
dh_fixperms
dh_makeshlibs
dh_installdeb
- dh_shlibdeps -l.
+ dh_shlibdeps -l.:/usr/lib/grass/lib
dh_gencontrol
dh_md5sums
dh_builddeb
More information about the Pkg-grass-devel
mailing list