debian packaging update: allow building with GRASS 6.4 on sid

git-svn-id: http://svn.osgeo.org/qgis/trunk@10255 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 2, 2009 · 3b51848 · 3b51848
1 parent 3ac3029
commit 3b51848
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (1.1.0-1) UNRELEASED; urgency=low
+
+  * allow build with GRASS 6.4rc3
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Mon, 02 Mar 2009 21:06:07 +0100
+
 qgis (1.1.0) UNRELEASED; urgency=low
 
   * gridmaker plugin removed from package

diff --git a/debian/qgis.sh b/debian/qgis.sh
@@ -4,9 +4,9 @@ LD_LIBRARY_PATH=/usr/lib/grass/lib
 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 "$@"
diff --git a/debian/rules b/debian/rules
@@ -13,6 +13,7 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 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 @@ binary-arch: build install
 	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