Re: [SCM] grass branch, master, updated. upstream/6.4.1-52-gc2057cd

[Francesco P. Lovergine]

On Sat, Feb 25, 2012 at 02:37:44AM +, M. Hamish Bowman wrote:
> +# why not use 'sed -i' here?
>  cp $i $i.old
>  sed -e s,$ZOTPATH,,g $i.old >$i
>  rm -f $i.old
> 

Probably because that script has been introduced when sed did not have a -i arg?
I would change it properly to use a modern sed version.

-- 
Francesco P. Lovergine

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[SCM] grass branch, master, updated. upstream/6.4.1-52-gc2057cd

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit c2057cddae06cf15e392e69c1f1cc37a75c47dc0
Author: M. Hamish Bowman 
Date:   Sat Feb 25 15:37:18 2012 +1300

debian/rules:
 alpha sort file lists;
 clarify code comment;
 delete duplicated grass-gui stuff from grass-core package;
 delete python compiled files (TODO: rebuild the .pyc anew in postinst);
 remove outdated 6.4.1 icon file fixup.

diff --git a/debian/rules b/debian/rules
index b15c5db..ac43fec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,21 +120,26 @@ endif
rm -f debian/$(BASE_NAME).1
rm -f error.log
# clean doxygen documentation (programming man)
-   rm -rf doxygenhtml lib/vector/html lib/db/html lib/gis/html \
-   lib/vector/latex lib/db/latex lib/gis/latex \
+   rm -rf doxygenhtml \
+   lib/db/html \
+   lib/db/latex \
lib/g3d/html \
-   lib/ogsf/html \
-   lib/proj/html \
-   lib/gmath/html \
-   lib/segment/html \
-   lib/vector/dglib/html \
-   rfc/html \
lib/g3d/latex \
+   lib/gis/html \
+   lib/gis/latex \
+   lib/gmath/html \
+   lib/gmath/latex \
+   lib/ogsf/html \
lib/ogsf/latex \
+   lib/proj/html \
lib/proj/latex \
-   lib/gmath/latex \
+   lib/segment/html \
lib/segment/latex \
+   lib/vector/dglib/html \
lib/vector/dglib/latex \
+   lib/vector/html \
+   lib/vector/latex \
+   rfc/html \
rfc/latex
 
 install: build
@@ -150,7 +155,7 @@ install: build
PREFIX=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \
BINDIR=$(CURDIR)/debian/tmp/usr/bin
 
-   # fix all the braindead scripts
+   # make all the self-bootstrapping tcl/tk scripts executable and fully 
pathed
debian/fixscripts.sh
 
# fix links
@@ -159,6 +164,23 @@ install: build
# delete extra license files
rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LICENSE.txt
 
+   # 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
+   rm -rf debian/$(PKG_NAME)-core/usr/lib/$(BASE_NAME)/$COMPONENT
+   done
+
+   # delete python compiled files
+   rf -f debian/tmp/usr/lib/$(BASE_NAME)/etc/python/grass/lib/*.pyc
+   # ..FIXME..: rebuild the .pyc anew in postinst
+
# change section from 1 to .1grass 
mv debian/tmp/usr/lib/$(BASE_NAME)/man/man1/grass6.1 
debian/$(BASE_NAME).1
for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1; do \
@@ -198,9 +220,8 @@ install: build
debian/tmp/usr/share/icons/hicolor/48x48/apps/$(BASE_NAME).png
install -m 644 gui/icons/grass.desktop \
debian/tmp/usr/share/applications/$(BASE_NAME).desktop
-   # 6.4.1 shipped with "grass65" as the Exec target
+   # n.b. 6.4.1 shipped with "grass65" as the Exec target
sed -i -e 's+/usr/share/icons/grass-48x48.png+$(BASE_NAME)+' \
-   -e 's+grass65+$(BASE_NAME)+' \
debian/tmp/usr/share/applications/$(BASE_NAME).desktop
 
# install x-grass wrapper script

-- 
Geographic Resources Analysis Support System

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[SCM] grass branch, master, updated. upstream/6.4.1-52-gc2057cd

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 96cde83d5e82242a659c278ec7b7422180f51a02
Author: M. Hamish Bowman 
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   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 \

[SCM] grass branch, master, updated. upstream/6.4.1-52-gc2057cd

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 6c0bf8ad105d84861b59790394b50ed253192a53
Author: M. Hamish Bowman 
Date:   Sat Feb 25 15:13:56 2012 +1300

+comment about a better way to edit inplace

diff --git a/debian/fixpaths.sh b/debian/fixpaths.sh
index 0463ed1..b794362 100755
--- a/debian/fixpaths.sh
+++ b/debian/fixpaths.sh
@@ -12,6 +12,7 @@ echo " in $TMPPATH"
 
 for i in `grep -r $ZOTPATH $TMPPATH | cut -d : -f 1 | sort -u` ; do
 echo -n "Grr. Zotting $i ... "
+# why not use 'sed -i' here?
 cp $i $i.old
 sed -e s,$ZOTPATH,,g $i.old >$i
 rm -f $i.old

-- 
Geographic Resources Analysis Support System

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel