[SCM] grass branch, master, updated. upstream/6.4.1-52-gc2057cd
M. Hamish Bowman
hamish_b at yahoo.com
Sat Feb 25 02:37:44 UTC 2012
The following commit has been merged in the master branch:
commit 96cde83d5e82242a659c278ec7b7422180f51a02
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date: Sat Feb 25 15:11:49 2012 +1300
Remove outdated cruft from and alpha-sort files in debian/fixscripts.sh
diff --git a/debian/changelog b/debian/changelog
index db54d2d..473e8ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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.
+ * Remove outdated cruft from debian/fixscripts.sh.
-- M. Hamish Bowman <hamish_b at yahoo.com> Thu, 23 Feb 2012 19:09:32 +1300
diff --git a/debian/fixscripts.sh b/debian/fixscripts.sh
index dcf6e36..188faa7 100755
--- a/debian/fixscripts.sh
+++ b/debian/fixscripts.sh
@@ -6,12 +6,6 @@
CURDIR=$(pwd)
VERSION=$(echo $(head -2 $CURDIR/include/VERSION)|sed -e 's/ //')
-# make these scripts executable
-for x in etc/water/seg
-do
- chmod +x $CURDIR/debian/tmp/usr/lib/grass$VERSION/$x
-done
-
# silence bogus lintian complaint about interpreter-not-absolute
for x in script_get_line \
script_play \
@@ -20,6 +14,7 @@ for x in script_get_line \
nviz2.2_script
do
f=$CURDIR/debian/tmp/usr/lib/grass$VERSION/etc/nviz2.2/scripts/$x
+ # why not use 'sed -i' here?
sed -e "s.!nviz.!/usr/lib/grass$VERSION/bin/nviz." $f >foo && cat foo >$f
done
@@ -27,23 +22,13 @@ for x in panel_label.tcl \
panel_scale.tcl
do
f=$CURDIR/debian/tmp/usr/lib/grass$VERSION/etc/nviz2.2/scripts/$x
+ # why not use 'sed -i' here?
sed -e "s%!../glnviz.new/nvwish%!/usr/lib/grass$VERSION/etc/nviz2.2/glnviz/nvwish%" $f >foo && cat foo >$f
done
rm foo
-# silence lintian warning executable-not-elf-or-script
-# add shebang to scripts that need it
-#for x in etc/copy
-#do
-# f=$CURDIR/debian/tmp/usr/lib/grass$VERSION/$x
-# cp $f foo; echo "#!/bin/sh" >$f; cat foo >>$f
-#done
-#rm foo
-
# silence lintian warning script-not-executable
for x in etc/dm/tksys.tcl \
- etc/gem/skeleton/post \
- etc/gem/skeleton/uninstall \
etc/gm/animate.tcl
do
chmod +x $CURDIR/debian/tmp/usr/lib/grass$VERSION/$x
@@ -51,62 +36,63 @@ done
# silence executable-not-elf-or-script lintian warning
# most tcl scripts don't need to be executable
-for x in etc/nviz2.2/scripts/panel_kanimator.tcl \
- etc/nviz2.2/scripts/panel_scale.tcl \
- etc/nviz2.2/scripts/structlib.tcl \
- etc/nviz2.2/scripts/panel_label.tcl \
- etc/nviz2.2/scripts/attPopup.tcl \
- etc/nviz2.2/scripts/attIsosurfPopup.tcl \
- etc/nviz2.2/scripts/panel_pos.tcl \
- etc/nviz2.2/scripts/panel_vol.tcl \
- etc/nviz2.2/scripts/panelIndex \
+for x in etc/dm/cmd.tcl \
+ etc/dm/d.m.tcl \
+ etc/dm/grassabout.tcl \
+ etc/dm/group.tcl \
etc/dm/labels.tcl \
- etc/dm/cmd.tcl \
etc/dm/menu.tcl \
+ etc/dm/print.tcl \
+ etc/dm/raster.tcl \
+ etc/dm/tool.tcl \
+ etc/dm/tree.tcl \
+ etc/dm/vector.tcl \
+ etc/epsg_option.tcl \
+ etc/gis_set.tcl \
+ etc/nviz2.2/scripts/assoc.tcl \
+ etc/nviz2.2/scripts/attIsosurfPopup.tcl \
+ etc/nviz2.2/scripts/attPopup.tcl \
etc/nviz2.2/scripts/colorPopup.tcl \
+ etc/nviz2.2/scripts/config.tcl \
+ etc/nviz2.2/scripts/cutplane_channels.tcl \
+ etc/nviz2.2/scripts/extra_bindings.tcl \
+ etc/nviz2.2/scripts/fileBrowser.tcl \
+ etc/nviz2.2/scripts/filemapBrowser.tcl \
+ etc/nviz2.2/scripts/mapBrowser.tcl \
etc/nviz2.2/scripts/multimapBrowser.tcl \
+ etc/nviz2.2/scripts/nviz_init.tcl \
+ etc/nviz2.2/scripts/panelIndex \
etc/nviz2.2/scripts/panel_animation.tcl \
- etc/nviz2.2/scripts/script_support.tcl \
- etc/nviz2.2/scripts/panel_vect.tcl \
- etc/nviz2.2/scripts/panel_sdiff.tcl \
- etc/nviz2.2/scripts/assoc.tcl \
- etc/nviz2.2/scripts/unique.tcl \
- etc/nviz2.2/scripts/panel_main.tcl \
- etc/dm/grassabout.tcl \
- etc/nviz2.2/scripts/position_procs.tcl \
+ etc/nviz2.2/scripts/panel_color.tcl \
+ etc/nviz2.2/scripts/panel_cutplane.tcl \
+ etc/nviz2.2/scripts/panel_kanimator.tcl \
+ etc/nviz2.2/scripts/panel_label.tcl \
etc/nviz2.2/scripts/panel_lights.tcl \
- etc/dm/d.m.tcl \
+ etc/nviz2.2/scripts/panel_main.tcl \
+ etc/nviz2.2/scripts/panel_pos.tcl \
etc/nviz2.2/scripts/panel_query.tcl \
- etc/v.digit/cats.tcl \
- etc/epsg_option.tcl \
etc/nviz2.2/scripts/panel_query_orig.tcl \
- etc/nviz2.2/scripts/nviz_init.tcl \
- etc/dm/vector.tcl \
- etc/nviz2.2/scripts/cutplane_channels.tcl \
- etc/gis_set.tcl \
- etc/nviz2.2/scripts/panel_tst.tcl \
- etc/nviz2.2/scripts/tclIndex \
- etc/nviz2.2/scripts/send_support.tcl \
- etc/nviz2.2/scripts/panel_surf.tcl \
- etc/nviz2.2/scripts/widgets.tcl \
- etc/dm/group.tcl \
- etc/dm/tool.tcl \
- etc/nviz2.2/scripts/panel_color.tcl \
- etc/v.digit/toolbox.tcl \
- etc/nviz2.2/scripts/extra_bindings.tcl \
etc/nviz2.2/scripts/panel_query_pg.tcl \
- etc/dm/print.tcl \
- etc/nviz2.2/scripts/panel_cutplane.tcl \
+ etc/nviz2.2/scripts/panel_scale.tcl \
+ etc/nviz2.2/scripts/panel_sdiff.tcl \
etc/nviz2.2/scripts/panel_site.tcl \
- etc/nviz2.2/scripts/config.tcl \
- etc/nviz2.2/scripts/filemapBrowser.tcl \
- etc/dm/tree.tcl \
- etc/nviz2.2/scripts/mapBrowser.tcl \
+ etc/nviz2.2/scripts/panel_surf.tcl \
+ etc/nviz2.2/scripts/panel_tst.tcl \
+ etc/nviz2.2/scripts/panel_vect.tcl \
+ etc/nviz2.2/scripts/panel_vol.tcl \
+ etc/nviz2.2/scripts/position_procs.tcl \
etc/nviz2.2/scripts/queue.tcl \
- etc/dm/raster.tcl \
- etc/v.digit/settings.tcl \
+ etc/nviz2.2/scripts/script_support.tcl \
+ etc/nviz2.2/scripts/send_support.tcl \
+ etc/nviz2.2/scripts/structlib.tcl \
+ etc/nviz2.2/scripts/tclIndex \
+ etc/nviz2.2/scripts/unique.tcl \
+ etc/nviz2.2/scripts/widgets.tcl \
etc/nviz2.2/scripts/wirecolorPopup.tcl \
- etc/nviz2.2/scripts/fileBrowser.tcl
+ etc/v.digit/cats.tcl \
+ etc/v.digit/settings.tcl \
+ etc/v.digit/toolbox.tcl
do
chmod -x $CURDIR/debian/tmp/usr/lib/grass$VERSION/$x
done
+
--
Geographic Resources Analysis Support System
More information about the Pkg-grass-devel
mailing list