[DebianGIS-dev] r2859 - in packages/gdal-grass/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-05-12 09:24:40 +0000 (Wed, 12 May 2010)
New Revision: 2859

Removed:
   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/control.in
   packages/gdal-grass/trunk/debian/patches/00list
Log:
Removed obsolete patch.


Modified: packages/gdal-grass/trunk/debian/changelog
===================================================================
--- packages/gdal-grass/trunk/debian/changelog	2010-05-12 09:09:49 UTC (rev 2858)
+++ packages/gdal-grass/trunk/debian/changelog	2010-05-12 09:24:40 UTC (rev 2859)
@@ -1,8 +1,9 @@
 libgdal-grass (1.7.2-1) experimental; urgency=low
 
   * New upstream release.
+  * Removed now obsolete path.dpatch patch.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 12 May 2010 10:53:42 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 12 May 2010 11:21:42 +0200
 
 libgdal-grass (1.6.3-3) unstable; urgency=low
 

Modified: packages/gdal-grass/trunk/debian/control
===================================================================
--- packages/gdal-grass/trunk/debian/control	2010-05-12 09:09:49 UTC (rev 2858)
+++ packages/gdal-grass/trunk/debian/control	2010-05-12 09:24:40 UTC (rev 2859)
@@ -3,7 +3,7 @@
 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 (>= 7), d-shlibs, libgdal-dev (>= 1.7.0), pkg-config, grass-dev (>= 6.4.0~rc5), 
+Build-Depends: debhelper (>= 7), d-shlibs, libgdal1-dev (>= 1.7.0), pkg-config, grass-dev (>= 6.4.0~rc5), 
  grass (>= 6.4.0~rc5), dpatch, libproj-dev
 Standards-Version: 3.8.4
 Homepage: http://www.gdal.org/

Modified: packages/gdal-grass/trunk/debian/control.in
===================================================================
--- packages/gdal-grass/trunk/debian/control.in	2010-05-12 09:09:49 UTC (rev 2858)
+++ packages/gdal-grass/trunk/debian/control.in	2010-05-12 09:24:40 UTC (rev 2859)
@@ -3,7 +3,7 @@
 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 (>= 7), d-shlibs, libgdal-dev (>= 1.7.0), pkg-config, grass-dev (>= 6.4.0~rc5), 
+Build-Depends: debhelper (>= 7), d-shlibs, libgdal1-dev (>= 1.7.0), pkg-config, grass-dev (>= 6.4.0~rc5), 
  grass (>= 6.4.0~rc5), dpatch, libproj-dev
 Standards-Version: 3.8.4
 Homepage: http://www.gdal.org/

Modified: packages/gdal-grass/trunk/debian/patches/00list
===================================================================
--- packages/gdal-grass/trunk/debian/patches/00list	2010-05-12 09:09:49 UTC (rev 2858)
+++ packages/gdal-grass/trunk/debian/patches/00list	2010-05-12 09:24:40 UTC (rev 2859)
@@ -1,2 +1 @@
-path
 rpath

Deleted: packages/gdal-grass/trunk/debian/patches/path.dpatch
===================================================================
--- packages/gdal-grass/trunk/debian/patches/path.dpatch	2010-05-12 09:09:49 UTC (rev 2858)
+++ packages/gdal-grass/trunk/debian/patches/path.dpatch	2010-05-12 09:24:40 UTC (rev 2859)
@@ -1,19 +0,0 @@
-#! /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/grass64/" );	
-         putenv( fake_gisbase );
- 	hasGisbase = false;
-     } else {