[DebianGIS-dev] r1951 - in packages/gdal-grass/branches/1.5/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-03-03 16:34:30 +0000 (Tue, 03 Mar 2009)
New Revision: 1951

Added:
   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/patches/00list
Log:
Fixes for 1.5.4-3


Modified: packages/gdal-grass/branches/1.5/debian/changelog
===================================================================
--- packages/gdal-grass/branches/1.5/debian/changelog	2009-03-03 13:32:22 UTC (rev 1950)
+++ packages/gdal-grass/branches/1.5/debian/changelog	2009-03-03 16:34:30 UTC (rev 1951)
@@ -1,3 +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.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 03 Mar 2009 17:14:43 +0100
+
 libgdal-grass (1.5.4-2) unstable; urgency=low
 
   * Fixed path.dpatch for grass 6.4 path.

Modified: packages/gdal-grass/branches/1.5/debian/patches/00list
===================================================================
--- packages/gdal-grass/branches/1.5/debian/patches/00list	2009-03-03 13:32:22 UTC (rev 1950)
+++ packages/gdal-grass/branches/1.5/debian/patches/00list	2009-03-03 16:34:30 UTC (rev 1951)
@@ -1 +1,2 @@
 path
+rpath

Added: packages/gdal-grass/branches/1.5/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-03 16:34:30 UTC (rev 1951)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## rpath.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 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/branches/1.5/debian/patches/rpath.dpatch
___________________________________________________________________
Name: svn:executable
   + *