[DebianGIS-dev] r2280 - packages/grass/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-06-12 10:43:07 +0000 (Fri, 12 Jun 2009)
New Revision: 2280

Added:
   packages/grass/trunk/debian/grass.menu.in
   packages/grass/trunk/debian/x-grass
Modified:
   packages/grass/trunk/debian/changelog
   packages/grass/trunk/debian/control.in
   packages/grass/trunk/debian/rules
Log:
Added a useful wrapper and other changes


Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog	2009-06-12 10:20:30 UTC (rev 2279)
+++ packages/grass/trunk/debian/changelog	2009-06-12 10:43:07 UTC (rev 2280)
@@ -1,3 +1,11 @@
+grass (6.4.0~rc5-2) unstable; urgency=low
+
+  * NOT RELEASED YET
+  * Added a grass menu item (Hamish).
+  * Added a grass.menu.in template.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 12 Jun 2009 10:32:40 +0200
+
 grass (6.4.0~rc5-1) unstable; urgency=low
 
   * New upstream release candidate.

Modified: packages/grass/trunk/debian/control.in
===================================================================
--- packages/grass/trunk/debian/control.in	2009-06-12 10:20:30 UTC (rev 2279)
+++ packages/grass/trunk/debian/control.in	2009-06-12 10:43:07 UTC (rev 2280)
@@ -19,7 +19,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator
 Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
- gnuplot, grass-doc, xml2, wget | curl, python-opengl, python-wxgtk2.8
+ gnuplot, xml2, wget | curl, python-opengl, python-wxgtk2.8
 Recommends: python (>= 2.5), python-numpy, ghostscript
 Provides: grass at VERSION@
 Description: Geographic Resources Analysis Support System 

Added: packages/grass/trunk/debian/grass.menu.in
===================================================================
--- packages/grass/trunk/debian/grass.menu.in	                        (rev 0)
+++ packages/grass/trunk/debian/grass.menu.in	2009-06-12 10:43:07 UTC (rev 2280)
@@ -0,0 +1,5 @@
+?package(grass):needs="text"\
+  section="Applications/Science/Geoscience"\
+  title="GRASS GIS"\
+  command="/usr/bin/grass"\
+  icon="/usr/lib/grass at VERSION@/etc/gui/icons/grass.ico"

Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules	2009-06-12 10:20:30 UTC (rev 2279)
+++ packages/grass/trunk/debian/rules	2009-06-12 10:43:07 UTC (rev 2280)
@@ -201,6 +201,7 @@
 	dh_installdocs  -a
 	dh_installexamples  -a
 	dh_install -a
+	dh_installmenu -a
 	dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a
 	dh_link -a
 	dh_strip -a

Added: packages/grass/trunk/debian/x-grass
===================================================================
--- packages/grass/trunk/debian/x-grass	                        (rev 0)
+++ packages/grass/trunk/debian/x-grass	2009-06-12 10:43:07 UTC (rev 2280)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# This is a wrapper to call GRASS without a running xterm.
+#
+
+if [ "$DISPLAY" != "" ]; then
+	if [ $(tty) != "" ]; then
+		exec /usr/bin/grass "$@"
+	else
+		exec x-terminal-emulator -e /bin/sh -c "/usr/bin/grass $@" 
+	fi
+else
+	if [ $(tty) != "" ]; then
+		exec /usr/bin/grass "$@"
+	fi
+fi
+
+# Cannot run without a terminal
+exit 255


Property changes on: packages/grass/trunk/debian/x-grass
___________________________________________________________________
Added: svn:executable
   + *