[SCM] grass branch, master, updated. upstream/6.4.1-38-g3a79424

Francesco P. Lovergine francesco at lovergine.com
Sun Feb 12 09:24:21 UTC 2012


The following commit has been merged in the master branch:
commit 3a79424839a26dca1c2c52f980357d0d24641b3c
Author: Francesco P. Lovergine <francesco at lovergine.com>
Date:   Sun Feb 12 10:23:27 2012 +0100

    Restored debian/grass.desktop and provided a better set of deps for grass-dev.

diff --git a/debian/control b/debian/control
index 67d82b0..4f4fc62 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,8 @@ Description: Geographic Resources Analysis Support System documentation
 Package: grass-dev
 Section: devel
 Architecture: any
-Depends: grass (= ${binary:Version}), fakeroot, libproj-dev, libgdal1-dev, ${misc:Depends}
+Depends: grass (= ${binary:Version}), libproj-dev, libgdal1-dev, ${misc:Depends}
+Recommends: subversion
 Suggests: pkg-config
 Provides: grass64-dev
 Description: GRASS GIS development files
diff --git a/debian/control.in b/debian/control.in
index 148da7c..dd9e1b1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -48,7 +48,8 @@ Description: Geographic Resources Analysis Support System documentation
 Package: grass-dev
 Section: devel
 Architecture: any
-Depends: grass (= ${binary:Version}), fakeroot, libproj-dev, libgdal1-dev, ${misc:Depends}
+Depends: grass (= ${binary:Version}), libproj-dev, libgdal1-dev, ${misc:Depends}
+Recommends: subversion
 Suggests: pkg-config
 Provides: grass at VERSION@-dev
 Description: GRASS GIS development files
diff --git a/gui/icons/grass.desktop b/debian/grass.desktop
similarity index 65%
copy from gui/icons/grass.desktop
copy to debian/grass.desktop
index b8a1930..edc0fbf 100644
--- a/gui/icons/grass.desktop
+++ b/debian/grass.desktop
@@ -4,6 +4,6 @@ Encoding=UTF-8
 Name=GRASS GIS
 Comment=
 Categories=Application;Education;Geography;
-Exec=grass65
-Icon=/usr/share/icons/grass-48x48.png
+Exec=/usr/bin/grass
+Icon=/usr/share/icons/hicolor/32x32/grass64.xpm
 Terminal=true

-- 
Geographic Resources Analysis Support System



More information about the Pkg-grass-devel mailing list