[SCM] grass branch, master, updated. upstream/6.4.1-44-gfb49c38

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit fb49c3869db6163216897ed95dc237cd6fb23080
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Fri Feb 24 19:12:26 2012 +1300

    move over dirs for the grass-gui pkg; patch to show user hint that g.extension needs the grass-dev pkg; use upstream's app.desktop file

diff --git a/debian/changelog b/debian/changelog
index 4d2673c..db54d2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ grass (6.4.2-1) unstable; urgency=low
 
   * Packaged new upstream version.
   * Reorganize binary packages, new: grass-core, grass-gui, grass-dev-doc.
+  * Patch g.extension.sh to check for the needed grass-dev package.
 
  -- M. Hamish Bowman <hamish_b at yahoo.com>  Thu, 23 Feb 2012 19:09:32 +1300
 
diff --git a/debian/grass-core.desktop b/debian/grass-core.desktop
deleted file mode 100644
index edc0fbf..0000000
--- a/debian/grass-core.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=GRASS GIS
-Comment=
-Categories=Application;Education;Geography;
-Exec=/usr/bin/grass
-Icon=/usr/share/icons/hicolor/32x32/grass64.xpm
-Terminal=true
diff --git a/debian/grass-core.install b/debian/grass-core.install
index 455ea38..c52044e 100644
--- a/debian/grass-core.install
+++ b/debian/grass-core.install
@@ -1,6 +1,5 @@
 usr/bin/grass64
 usr/lib/grass64/bin
-usr/lib/grass64/bwidget
 usr/lib/grass64/driver
 usr/lib/grass64/etc
 usr/lib/grass64/fonts
diff --git a/debian/grass-core.install.in b/debian/grass-core.install.in
index cae68bd..4d1112d 100644
--- a/debian/grass-core.install.in
+++ b/debian/grass-core.install.in
@@ -1,6 +1,5 @@
 usr/bin/grass at VERSION@
 usr/lib/grass at VERSION@/bin
-usr/lib/grass at VERSION@/bwidget
 usr/lib/grass at VERSION@/driver
 usr/lib/grass at VERSION@/etc
 usr/lib/grass at VERSION@/fonts
diff --git a/debian/grass-gui.install b/debian/grass-gui.install
new file mode 100644
index 0000000..b63fe7d
--- /dev/null
+++ b/debian/grass-gui.install
@@ -0,0 +1,9 @@
+usr/lib/grass64/bwidget
+usr/lib/grass64/etc/dm
+usr/lib/grass64/etc/form
+usr/lib/grass64/etc/gui
+usr/lib/grass64/etc/gm
+usr/lib/grass64/etc/gtcltk
+usr/lib/grass64/etc/nviz2.2
+usr/lib/grass64/etc/v.digit
+usr/lib/grass64/etc/wxpython
diff --git a/debian/grass-gui.install.in b/debian/grass-gui.install.in
new file mode 100644
index 0000000..40d8914
--- /dev/null
+++ b/debian/grass-gui.install.in
@@ -0,0 +1,9 @@
+usr/lib/grass at VERSION@/bwidget
+usr/lib/grass at VERSION@/etc/dm
+usr/lib/grass at VERSION@/etc/form
+usr/lib/grass at VERSION@/etc/gui
+usr/lib/grass at VERSION@/etc/gm
+usr/lib/grass at VERSION@/etc/gtcltk
+usr/lib/grass at VERSION@/etc/nviz2.2
+usr/lib/grass at VERSION@/etc/v.digit
+usr/lib/grass at VERSION@/etc/wxpython
diff --git a/debian/patches/check4dev b/debian/patches/check4dev
new file mode 100644
index 0000000..535fb2a
--- /dev/null
+++ b/debian/patches/check4dev
@@ -0,0 +1,19 @@
+Index: grass/scripts/g.extension
+===================================================================
+--- grass.orig/scripts/g.extension	2012-02-24 18:06:25.980494464 +1300
++++ grass/scripts/g.extension	2012-02-24 18:08:03.756783834 +1300
+@@ -75,6 +75,14 @@
+   exec g.parser "$0" "$@"
+ fi
+ 
++
++# check if we have the grass include and Make files
++dpkg-query -W grass-dev > /dev/null 2> /dev/null
++if [ $? -ne 0 ] ; then
++   g.message -w "This module requires the \"grass-dev\" package"
++fi
++
++
+ # definitions
+ 
+ SVNURL_ADDONS="$GIS_OPT_SVNURL"
diff --git a/debian/patches/series b/debian/patches/series
index 49f55f8..e7797bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ www-browser
 pager
 xterm
 instdir
+check4dev

-- 
Geographic Resources Analysis Support System