[SCM] grass branch, master, updated. upstream/6.4.1-54-g0c462f1

M. Hamish Bowman hamish_b at yahoo.com
Sat Feb 25 04:24:13 UTC 2012 

The following commit has been merged in the master branch:
commit 0c462f1f0af475e3d81ce2513069d9d8ae3d410c
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sat Feb 25 17:23:38 2012 +1300

    take care of more lintian warnings;
    fix menu icon path;
    rm more python bytecode;
    drop redundant Module.make copy;
    whitespace in rules file;
    clear TODOnes, add TODOs.

diff --git a/debian/TODO b/debian/TODO
index 38a790e..25d7a65 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -7,43 +7,20 @@ moved to /var/lib/grass or /usr/lib/grass, leaving symlinks so to not
 break things.
 
 
-
-Package re-org:
-
-[done]
- Move the programmers' manual out of grass-doc and into a new
- grass-doc-dev package, suggested by both grass-dev and grass-doc.
-   /usr/share/doc/grass-doc/programming-manual/
-
-
-[in progress]
- Move $GISBASE/etc/gui/ dm/ gm/ gtcltk/ wxpython/ nviz2.2/ v.digit/ form/
- into a separate grass-gui package, so that packages like QGIS don't
- have to install wxPython etc. as well.
- .
- Move remaining contents of the grass binary package into grass-core,
- and make the 'grass' binary package a virtual one depending on both
- grass-core and grass-gui, and recommending grass-doc.
-
-
-
 FIXME:
 
-E: grass-core: package-installs-python-bytecode usr/lib/grass64/etc/python/grass/lib/*.pyc
-( -> remove in prerm, generate anew in postinst )
-
-
-grass-core.install gets $GISBASE/etc/, but how to exclude the 8 grass-gui
-dirs from that without explicitly listsing in grass-core.install the other
-78 (or so) files in $GISBASE/etc/?
-
-
-Make use of upstream's gui/icons/grass.desktop file (include it in the
-grass-core package as it will launch the text-only version too), but
-perhaps we need to patch the Exec= line and or filename with @VERSION@
-to follow the other .in files?
-.
-Currently we ignore upstream's grass.menu file, Debian pkging's version
-is @VERSION at .in compliant. Suggest we continue to do so.
-
-
+E: grass-core: package-installs-python-bytecode usr/lib/grass64/etc/.../*.pyc
+( -> removed in rules, but still need to generate anew in postinst )
+
+
+Lintian:
+E: grass-gui: shell-script-fails-syntax-check usr/lib/grass64/etc/gm/animate.tcl
+W: grass-dev: copyright-without-copyright-notice
+W: grass-dev-doc: copyright-without-copyright-notice
+W: grass-dev-doc: embedded-javascript-library usr/share/doc/grass-dev-doc/programming-manual/html/db/html/jquery.js
+W: grass-dev-doc: embedded-javascript-library usr/share/doc/grass-dev-doc/programming-manual/html/gis/html/jquery.js
+W: grass-dev-doc: embedded-javascript-library usr/share/doc/grass-dev-doc/programming-manual/html/vector/html/jquery.js
+W: grass-core: copyright-without-copyright-notice
+W: grass-doc: copyright-without-copyright-notice
+W: grass: copyright-without-copyright-notice
+W: grass-gui: copyright-without-copyright-notice
diff --git a/debian/control b/debian/control
index 61f194c..6a95a63 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Architecture: all
 Depends: grass-core, grass-gui
 Recommends: grass-doc
 Suggests: grass-dev
-Description: GRASS GIS (The Geographic Resources Analysis Support System)
+Description: Geographic Resources Analysis Support System (GRASS GIS)
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
@@ -138,7 +138,7 @@ Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: grass
-Description: The GRASS GIS Programmers' Manual
+Description: GRASS GIS Programmers' Manual
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
diff --git a/debian/fixscripts.sh b/debian/fixscripts.sh
index 2e9a052..fdb9ce9 100755
--- a/debian/fixscripts.sh
+++ b/debian/fixscripts.sh
@@ -29,8 +29,10 @@ rm foo
 
 # silence lintian warning script-not-executable
 for x in etc/dm/tksys.tcl \
-    etc/gm/animate.tcl
-do 
+    etc/gm/animate.tcl \
+    etc/gem/skeleton/post \
+    etc/gem/skeleton/uninstall
+do
     chmod +x $CURDIR/debian/tmp/usr/lib/grass$VERSION/$x
 done
 
@@ -50,6 +52,7 @@ for x in etc/dm/cmd.tcl \
     etc/dm/vector.tcl \
     etc/epsg_option.tcl \
     etc/gis_set.tcl \
+    etc/gm/tksys.tcl \
     etc/nviz2.2/scripts/assoc.tcl \
     etc/nviz2.2/scripts/attIsosurfPopup.tcl \
     etc/nviz2.2/scripts/attPopup.tcl \
diff --git a/debian/grass-core.menu b/debian/grass-core.menu
index 3c65b3f..7c73b24 100644
--- a/debian/grass-core.menu
+++ b/debian/grass-core.menu
@@ -2,4 +2,4 @@
   section="Applications/Science/Geoscience"\
   title="GRASS GIS"\
   command="/usr/bin/grass"\
-  icon="/usr/share/icons/hicolor/32x32/grass64.xpm"
+  icon="/usr/share/icons/hicolor/32x32/apps/grass64.xpm"
diff --git a/debian/rules b/debian/rules
index 90c70ac..f5aab1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -164,8 +164,17 @@ install: build
 	# delete extra license files
 	rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LICENSE.txt
 
-	# delete python compiled files
-	rf -f debian/tmp/usr/lib/$(BASE_NAME)/etc/python/grass/lib/*.pyc
+	# delete python compiled bytecode files
+	for DIR in python/grass \
+		python/grass/lib \
+		python/grass/script \
+		wxpython \
+		wxpython/compat \
+		wxpython/gui_modules \
+		wxpython/icons ; \
+	     do \
+		rm -f debian/tmp/usr/lib/$(BASE_NAME)/etc/$$DIR/*.pyc ; \
+	done
 	# ..FIXME..: rebuild the .pyc anew in postinst
 
 	# change section from 1 to .1grass 
@@ -175,10 +184,6 @@ install: build
 	for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do \
 		sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' $$m; done
 
-	# install module makefile (redundant due to grass-dev.install?)
-	install -m 644 include/Make/Module.make \
-		debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/include/Make/Module.make
-
 	# adjust from build-server build dir to end-user's install dir
 	sed -i -e "s+^\(GRASS_HOME[ ]*=\) .*+\1 /usr/lib/$(BASE_NAME)+" \
 		-e "s+^\(RUN_GISBASE[ ]*=\) .*+\1 /usr/lib/$(BASE_NAME)+" \
@@ -258,14 +263,14 @@ binary-arch: install
 	dh_install -a
 	# delete duplicated grass-gui stuff from grass-core package
 	for COMPONENT in bwidget \
-		etc/dm \
-		etc/form \
-		etc/gm \
-		etc/gtcltk \
-		etc/gui \
-		etc/nviz2.2 \
-		etc/v.digit \
-		etc/wxpython ; do \
+			etc/dm \
+			etc/form \
+			etc/gm \
+			etc/gtcltk \
+			etc/gui \
+			etc/nviz2.2 \
+			etc/v.digit \
+			etc/wxpython ; do \
 		rm -rf debian/$(PKG_NAME)-core/usr/lib/$(BASE_NAME)/$$COMPONENT; \
 	done
 	dh_installmenu -a

-- 
Geographic Resources Analysis Support System

More information about the Pkg-grass-devel mailing list