[QGIS Commit] r10255 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-03-02 15:30:13 -0500 (Mon, 02 Mar 2009)
New Revision: 10255

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/qgis.sh
   trunk/qgis/debian/rules
Log:
debian packaging update: allow building with GRASS 6.4 on sid

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2009-03-02 15:26:20 UTC (rev 10254)
+++ trunk/qgis/debian/changelog	2009-03-02 20:30:13 UTC (rev 10255)
@@ -1,3 +1,9 @@
+qgis (1.1.0-1) UNRELEASED; urgency=low
+
+  * allow build with GRASS 6.4rc3
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Mon, 02 Mar 2009 21:06:07 +0100
+
 qgis (1.1.0) UNRELEASED; urgency=low
 
   * gridmaker plugin removed from package

Modified: trunk/qgis/debian/qgis.sh
===================================================================
--- trunk/qgis/debian/qgis.sh	2009-03-02 15:26:20 UTC (rev 10254)
+++ trunk/qgis/debian/qgis.sh	2009-03-02 20:30:13 UTC (rev 10255)
@@ -4,9 +4,9 @@
 export LD_LIBRARY_PATH
 
 if [ "$LD_LIBRARY_PATH" = "" ]; then
-	LD_LIBRARY_PATH=/usr/lib/grass/lib
+	LD_LIBRARY_PATH=/usr/lib/grass/lib:/usr/lib/grass64/lib
 else
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass/lib
+	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass/lib:/usr/lib/grass64/lib
 fi
 
 exec $0.bin "$@"

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2009-03-02 15:26:20 UTC (rev 10254)
+++ trunk/qgis/debian/rules	2009-03-02 20:30:13 UTC (rev 10255)
@@ -13,6 +13,7 @@
 
 CMAKE_OPTS = \
 	-Wno-dev \
+	-D GRASS_PREFIX=/usr/lib/grass64 \
 	-D CMAKE_INSTALL_PREFIX=/usr \
 	-D CMAKE_SKIP_RPATH=TRUE \
 	-D BINDINGS_GLOBAL_INSTALL=TRUE \
@@ -116,7 +117,7 @@
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib dh_shlibdeps
+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib:/usr/lib/grass64/lib dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb