[QGIS Commit] r9205 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-08-28 18:22:48 -0400 (Thu, 28 Aug 2008)
New Revision: 9205

Added:
   trunk/qgis/debian/qgis-plugin-grass.postrm
   trunk/qgis/debian/qgis-plugin-grass.preinst
   trunk/qgis/debian/qgis.sh
Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/qgis.install
   trunk/qgis/debian/rules
Log:
update debian packaging of grass plugin

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2008-08-28 21:37:58 UTC (rev 9204)
+++ trunk/qgis/debian/changelog	2008-08-28 22:22:48 UTC (rev 9205)
@@ -1,3 +1,10 @@
+qgis (1.0preview5) experimental; urgency=low
+
+  * add wrapper scripts to qgis-plugin-grass that adds the grass
+    shared libraries to LD_LIBRARY_PATH.
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Fri, 29 Aug 2008 00:19:05 +0200
+
 qgis (1.0preview4) experimental; urgency=low
 
   * add ogr converter plugin

Added: trunk/qgis/debian/qgis-plugin-grass.postrm
===================================================================
--- trunk/qgis/debian/qgis-plugin-grass.postrm	                        (rev 0)
+++ trunk/qgis/debian/qgis-plugin-grass.postrm	2008-08-28 22:22:48 UTC (rev 9205)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ "$1" = "remove" ]; then
+	dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis /usr/bin/qgis
+fi


Property changes on: trunk/qgis/debian/qgis-plugin-grass.postrm
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/qgis/debian/qgis-plugin-grass.preinst
===================================================================
--- trunk/qgis/debian/qgis-plugin-grass.preinst	                        (rev 0)
+++ trunk/qgis/debian/qgis-plugin-grass.preinst	2008-08-28 22:22:48 UTC (rev 9205)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+	dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
+fi


Property changes on: trunk/qgis/debian/qgis-plugin-grass.preinst
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/qgis/debian/qgis.install
===================================================================
--- trunk/qgis/debian/qgis.install	2008-08-28 21:37:58 UTC (rev 9204)
+++ trunk/qgis/debian/qgis.install	2008-08-28 22:22:48 UTC (rev 9205)
@@ -1,4 +1,4 @@
-usr/bin/*
+usr/bin/qgis_help
 usr/share/qgis/doc/CODING
 usr/share/qgis/doc/favicon.ico 
 usr/share/qgis/doc/index.html

Added: trunk/qgis/debian/qgis.sh
===================================================================
--- trunk/qgis/debian/qgis.sh	                        (rev 0)
+++ trunk/qgis/debian/qgis.sh	2008-08-28 22:22:48 UTC (rev 9205)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+LD_LIBRARY_PATH=/usr/lib/grass/lib
+export LD_LIBRARY_PATH
+
+if [ "$LD_LIBRARY_PATH" = "" ]; then
+	LD_LIBRARY_PATH=/usr/lib/grass/lib
+else
+	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass/lib
+fi
+
+exec $0.bin "$@"

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2008-08-28 21:37:58 UTC (rev 9204)
+++ trunk/qgis/debian/rules	2008-08-28 22:22:48 UTC (rev 9205)
@@ -13,7 +13,12 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CMAKE_OPTS = -Wno-dev -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_SKIP_RPATH=TRUE -D BINDINGS_GLOBAL_INSTALL=TRUE -D PEDANTIC=TRUE
+CMAKE_OPTS = \
+	-Wno-dev \
+	-D CMAKE_INSTALL_PREFIX=/usr \
+	-D CMAKE_SKIP_RPATH=TRUE \
+	-D BINDINGS_GLOBAL_INSTALL=TRUE \
+	-D PEDANTIC=TRUE \
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -86,6 +91,13 @@
 	dh_installdocs
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp
+
+	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
+	install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
+
+	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
+	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
+	
 	dh_pycentral
 	dh_installmenu
 	dh_icons
@@ -99,7 +111,7 @@
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps
+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb