Author: frankie
Date: 2009-03-03 16:40:57 +0000 (Tue, 03 Mar 2009)
New Revision: 1953
Added:
packages/gdal-grass/trunk/debian/patches/rpath.dpatch
Modified:
packages/gdal-grass/trunk/debian/patches/00list
packages/gdal-grass/trunk/debian/patches/path.dpatch
Log:
Merging rpath.dpatch from 1.5 series.
Modified: packages/gdal-grass/trunk/debian/patches/00list
===================================================================
--- packages/gdal-grass/trunk/debian/patches/00list 2009-03-03 16:37:00 UTC
(rev 1952)
+++ packages/gdal-grass/trunk/debian/patches/00list 2009-03-03 16:40:57 UTC
(rev 1953)
@@ -1 +1,2 @@
path
+rpath
Modified: packages/gdal-grass/trunk/debian/patches/path.dpatch
===================================================================
--- packages/gdal-grass/trunk/debian/patches/path.dpatch 2009-03-03
16:37:00 UTC (rev 1952)
+++ packages/gdal-grass/trunk/debian/patches/path.dpatch 2009-03-03
16:40:57 UTC (rev 1953)
@@ -13,7 +13,7 @@
// 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/grass/" );
++ sprintf(fake_gisbase, "GISBASE=/usr/lib/grass64/" );
putenv( fake_gisbase );
hasGisbase = false;
} else {
Added: packages/gdal-grass/trunk/debian/patches/rpath.dpatch
===================================================================
--- packages/gdal-grass/trunk/debian/patches/rpath.dpatch
(rev 0)
+++ packages/gdal-grass/trunk/debian/patches/rpath.dpatch 2009-03-03
16:40:57 UTC (rev 1953)
@@ -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: 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 $@ $<
Property changes on: packages/gdal-grass/trunk/debian/patches/rpath.dpatch
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
