[DebianGIS-dev] r553 - in packages/grass/branches/6.2~beta1/debian:
. patches
Francesco Lovergine
frankie at costa.debian.org
Tue Aug 29 08:34:20 UTC 2006
Author: frankie
Date: 2006-08-29 08:34:19 +0000 (Tue, 29 Aug 2006)
New Revision: 553
Removed:
packages/grass/branches/6.2~beta1/debian/patches/xterm-fix.dpatch
Modified:
packages/grass/branches/6.2~beta1/debian/changelog
packages/grass/branches/6.2~beta1/debian/grass.install
packages/grass/branches/6.2~beta1/debian/patches/00list
packages/grass/branches/6.2~beta1/debian/patches/htmlgen-fakeroot.dpatch
packages/grass/branches/6.2~beta1/debian/rules
Log:
Update to build-up 6.2~beta1
Modified: packages/grass/branches/6.2~beta1/debian/changelog
===================================================================
--- packages/grass/branches/6.2~beta1/debian/changelog 2006-08-29 08:29:15 UTC (rev 552)
+++ packages/grass/branches/6.2~beta1/debian/changelog 2006-08-29 08:34:19 UTC (rev 553)
@@ -1,3 +1,9 @@
+grass (6.2~beta1-1) UNRELEASED; urgency=low
+
+ * Development branch 6.2, branching from 6.1
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 28 Aug 2006 22:10:06 +0200
+
grass (6.1.0-1) UNRELEASED; urgency=low
* Starting development tree for 6.1 version.
Modified: packages/grass/branches/6.2~beta1/debian/grass.install
===================================================================
--- packages/grass/branches/6.2~beta1/debian/grass.install 2006-08-29 08:29:15 UTC (rev 552)
+++ packages/grass/branches/6.2~beta1/debian/grass.install 2006-08-29 08:34:19 UTC (rev 553)
@@ -1,4 +1,4 @@
-usr/bin/grass61
+usr/bin/grass62
usr/lib/grass/bin
usr/lib/grass/bwidget
usr/lib/grass/driver
Modified: packages/grass/branches/6.2~beta1/debian/patches/00list
===================================================================
--- packages/grass/branches/6.2~beta1/debian/patches/00list 2006-08-29 08:29:15 UTC (rev 552)
+++ packages/grass/branches/6.2~beta1/debian/patches/00list 2006-08-29 08:34:19 UTC (rev 553)
@@ -1,2 +1 @@
htmlgen-fakeroot
-xterm-fix
Modified: packages/grass/branches/6.2~beta1/debian/patches/htmlgen-fakeroot.dpatch
===================================================================
--- packages/grass/branches/6.2~beta1/debian/patches/htmlgen-fakeroot.dpatch 2006-08-29 08:29:15 UTC (rev 552)
+++ packages/grass/branches/6.2~beta1/debian/patches/htmlgen-fakeroot.dpatch 2006-08-29 08:34:19 UTC (rev 553)
@@ -7,15 +7,15 @@
## DP: pages from being built.
@DPATCH@
-diff -urNad grass-6.1.0~/include/Make/Html.make grass-6.1.0/include/Make/Html.make
---- grass-6.1.0~/include/Make/Html.make 2006-08-24 19:57:37.000000000 +0200
-+++ grass-6.1.0/include/Make/Html.make 2006-08-24 19:58:02.000000000 +0200
+diff -urNad grass-6.2~beta1~/include/Make/Html.make grass-6.2~beta1/include/Make/Html.make
+--- grass-6.2~beta1~/include/Make/Html.make 2006-08-28 22:31:15.000000000 +0200
++++ grass-6.2~beta1/include/Make/Html.make 2006-08-28 22:35:36.000000000 +0200
@@ -92,7 +92,7 @@
GISBASE=$(GISBASE) \
PATH=$(GISBASE)/bin:$$PATH \
$(LD_LIBRARY_PATH_VAR)="$(GISBASE)/lib:$($(LD_LIBRARY_PATH_VAR))" \
-- $(1) --html-description | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true
-+ fakeroot $(1) --html-description | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true
+- LC_ALL=C $(1) --html-description | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true
++ LC_ALL=C fakeroot $(1) --html-description | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true
# html rules for cmd commands
htmlcmd: htmlcmd1 htmlgen
Deleted: packages/grass/branches/6.2~beta1/debian/patches/xterm-fix.dpatch
===================================================================
--- packages/grass/branches/6.2~beta1/debian/patches/xterm-fix.dpatch 2006-08-29 08:29:15 UTC (rev 552)
+++ packages/grass/branches/6.2~beta1/debian/patches/xterm-fix.dpatch 2006-08-29 08:34:19 UTC (rev 553)
@@ -1,253 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## htmlgen-fakeroot.dpatch by <debian at adkgis.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: change all xterm occurences in debian x-terminal-emulator
-## DP: wrapper, as managed alternative.
-
- at DPATCH@
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/chart.tcl grass-6.1.0/gui/tcltk/d.m/chart.tcl
---- grass-6.1.0~/gui/tcltk/d.m/chart.tcl 2006-02-18 12:55:34.000000000 +0100
-+++ grass-6.1.0/gui/tcltk/d.m/chart.tcl 2006-08-24 20:02:27.000000000 +0200
-@@ -74,7 +74,7 @@
- global bgcolor
- set mapname $opt($id,map)
- set layernum $opt($id,layer)
-- exec xterm -bg $bgcolor -title "$mapname columns" \
-+ exec x-terminal-emulator -bg $bgcolor -title "$mapname columns" \
- -geometry 40x25-10+30 -sb -hold -e v.info -c map=$mapname \
- layer=$layernum &
- }
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/d.m.tcl grass-6.1.0/gui/tcltk/d.m/d.m.tcl
---- grass-6.1.0~/gui/tcltk/d.m/d.m.tcl 2006-07-31 22:12:37.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/d.m/d.m.tcl 2006-08-24 20:02:42.000000000 +0200
-@@ -192,7 +192,7 @@
- proc term_panel {cmd} {
- global outtext
- global env
-- eval exec -- xterm -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd &
-+ eval exec -- x-terminal-emulator -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd &
- set str $cmd
- $outtext insert end "$cmd\n"
- $outtext yview end
-@@ -211,7 +211,7 @@
- ###############################################################################
- proc term {cmd args} {
- global env
-- eval exec -- xterm -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd $args &
-+ eval exec -- x-terminal-emulator -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd $args &
- }
-
- ###############################################################################
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/script/d.colors.sh grass-6.1.0/gui/tcltk/d.m/script/d.colors.sh
---- grass-6.1.0~/gui/tcltk/d.m/script/d.colors.sh 2006-04-04 12:33:00.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/d.m/script/d.colors.sh 2006-08-24 20:03:06.000000000 +0200
-@@ -35,4 +35,4 @@
- exec g.parser "$0" "$@"
- fi
-
--eval `exec xterm -e d.colors map=$GIS_OPT_INPUT`
-+eval `exec x-terminal-emulator -e d.colors map=$GIS_OPT_INPUT`
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/script/d.text.sh grass-6.1.0/gui/tcltk/d.m/script/d.text.sh
---- grass-6.1.0~/gui/tcltk/d.m/script/d.text.sh 2006-04-04 12:33:00.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/d.m/script/d.text.sh 2006-08-24 20:02:55.000000000 +0200
-@@ -83,5 +83,5 @@
-
- echo $cmd
-
--eval `exec xterm -e $cmd`
-+eval `exec x-terminal-emulator -e $cmd`
-
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/script/r.colors.rules grass-6.1.0/gui/tcltk/d.m/script/r.colors.rules
---- grass-6.1.0~/gui/tcltk/d.m/script/r.colors.rules 2006-04-04 12:33:00.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/d.m/script/r.colors.rules 2006-08-24 20:03:11.000000000 +0200
-@@ -35,4 +35,4 @@
- exec g.parser "$0" "$@"
- fi
-
--eval `exec xterm -e r.colors map=$GIS_OPT_INPUT color=rules`
-+eval `exec x-terminal-emulator -e r.colors map=$GIS_OPT_INPUT color=rules`
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/script/r.reclass.rules grass-6.1.0/gui/tcltk/d.m/script/r.reclass.rules
---- grass-6.1.0~/gui/tcltk/d.m/script/r.reclass.rules 2006-04-04 12:33:00.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/d.m/script/r.reclass.rules 2006-08-24 20:02:48.000000000 +0200
-@@ -42,4 +42,4 @@
- exec g.parser "$0" "$@"
- fi
-
--eval `exec xterm -e r.reclass input=$GIS_OPT_INPUT output=$GIS_OPT_OUTPUT`
-+eval `exec x-terminal-emulator -e r.reclass input=$GIS_OPT_INPUT output=$GIS_OPT_OUTPUT`
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/script/r.recode.rules grass-6.1.0/gui/tcltk/d.m/script/r.recode.rules
---- grass-6.1.0~/gui/tcltk/d.m/script/r.recode.rules 2006-04-04 12:33:00.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/d.m/script/r.recode.rules 2006-08-24 20:03:23.000000000 +0200
-@@ -40,4 +40,4 @@
- exec g.parser "$0" "$@"
- fi
-
--eval `exec xterm -e r.recode input=$GIS_OPT_INPUT output=$GIS_OPT_OUTPUT`
-+eval `exec x-terminal-emulator -e r.recode input=$GIS_OPT_INPUT output=$GIS_OPT_OUTPUT`
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/script/r.support.sh grass-6.1.0/gui/tcltk/d.m/script/r.support.sh
---- grass-6.1.0~/gui/tcltk/d.m/script/r.support.sh 2006-04-04 12:33:00.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/d.m/script/r.support.sh 2006-08-24 20:03:00.000000000 +0200
-@@ -35,4 +35,4 @@
- exec g.parser "$0" "$@"
- fi
-
--eval `exec xterm -e r.support map=$GIS_OPT_INPUT`
-+eval `exec x-terminal-emulator -e r.support map=$GIS_OPT_INPUT`
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/thematic.tcl grass-6.1.0/gui/tcltk/d.m/thematic.tcl
---- grass-6.1.0~/gui/tcltk/d.m/thematic.tcl 2006-02-18 12:55:34.000000000 +0100
-+++ grass-6.1.0/gui/tcltk/d.m/thematic.tcl 2006-08-24 20:02:21.000000000 +0200
-@@ -83,7 +83,7 @@
- global bgcolor
- set mapname $opt($id,map)
- set layernum $opt($id,layer)
-- exec xterm -bg $bgcolor -title "$mapname columns" \
-+ exec x-terminal-emulator -bg $bgcolor -title "$mapname columns" \
- -geometry 40x25-10+30 -sb -hold -e v.info -c map=$mapname \
- layer=$layernum &
- }
-@@ -92,7 +92,7 @@
- variable opt
- global bgcolor
- set mapname $opt($id,map)
-- exec xterm -bg $bgcolor -title "$mapname data" \
-+ exec x-terminal-emulator -bg $bgcolor -title "$mapname data" \
- -geometry 60x40-10+30 -sb -hold -e db.select table=$mapname &
- }
-
-diff -urNad grass-6.1.0~/gui/tcltk/d.m/vector.tcl grass-6.1.0/gui/tcltk/d.m/vector.tcl
---- grass-6.1.0~/gui/tcltk/d.m/vector.tcl 2006-06-27 00:16:35.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/d.m/vector.tcl 2006-08-24 20:02:02.000000000 +0200
-@@ -154,7 +154,7 @@
- global bgcolor
- set mapname $opt($id,map)
- set layernum $opt($id,field)
-- exec xterm -bg $bgcolor -title "$mapname columns" \
-+ exec x-terminal-emulator -bg $bgcolor -title "$mapname columns" \
- -geometry 40x25-10+30 -sb -hold -e v.info -c map=$mapname \
- layer=$layernum &
- }
-@@ -163,7 +163,7 @@
- variable opt
- global bgcolor
- set mapname $opt($id,map)
-- exec xterm -bg $bgcolor -title "$mapname data" \
-+ exec x-terminal-emulator -bg $bgcolor -title "$mapname data" \
- -geometry 60x40-10+30 -sb -hold -e db.select table=$mapname &
- }
-
-diff -urNad grass-6.1.0~/gui/tcltk/gis.m/runandoutput.tcl grass-6.1.0/gui/tcltk/gis.m/runandoutput.tcl
---- grass-6.1.0~/gui/tcltk/gis.m/runandoutput.tcl 2006-07-22 11:29:48.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/gis.m/runandoutput.tcl 2006-08-24 20:04:33.000000000 +0200
-@@ -198,7 +198,7 @@
- ###############################################################################
- proc term {cmd args} {
- global env
-- eval [list exec -- xterm -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd] $args &
-+ eval [list exec -- x-terminal-emulator -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd] $args &
- }
-
- ###############################################################################
-diff -urNad grass-6.1.0~/gui/tcltk/gis.m/script/d.colors.sh grass-6.1.0/gui/tcltk/gis.m/script/d.colors.sh
---- grass-6.1.0~/gui/tcltk/gis.m/script/d.colors.sh 2006-07-07 02:34:32.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/gis.m/script/d.colors.sh 2006-08-24 20:03:46.000000000 +0200
-@@ -35,4 +35,4 @@
- exec g.parser "$0" "$@"
- fi
-
--exec xterm -e "$GISBASE/etc/grass-run.sh" d.colors "map=$GIS_OPT_INPUT"
-+exec x-terminal-emulator -e "$GISBASE/etc/grass-run.sh" d.colors "map=$GIS_OPT_INPUT"
-diff -urNad grass-6.1.0~/gui/tcltk/gis.m/script/d.text.sh grass-6.1.0/gui/tcltk/gis.m/script/d.text.sh
---- grass-6.1.0~/gui/tcltk/gis.m/script/d.text.sh 2006-07-07 02:34:32.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/gis.m/script/d.text.sh 2006-08-24 20:03:34.000000000 +0200
-@@ -83,5 +83,5 @@
-
- echo $cmd
-
--exec xterm -e "$GISBASE/etc/grass-run.sh" $cmd
-+exec x-terminal-emulator -e "$GISBASE/etc/grass-run.sh" $cmd
-
-diff -urNad grass-6.1.0~/gui/tcltk/gis.m/script/r.colors.rules grass-6.1.0/gui/tcltk/gis.m/script/r.colors.rules
---- grass-6.1.0~/gui/tcltk/gis.m/script/r.colors.rules 2006-07-07 02:34:32.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/gis.m/script/r.colors.rules 2006-08-24 20:03:49.000000000 +0200
-@@ -35,4 +35,4 @@
- exec g.parser "$0" "$@"
- fi
-
--exec xterm -e "$GISBASE/etc/grass-run.sh" r.colors "map=$GIS_OPT_INPUT" color=rules
-+exec x-terminal-emulator -e "$GISBASE/etc/grass-run.sh" r.colors "map=$GIS_OPT_INPUT" color=rules
-diff -urNad grass-6.1.0~/gui/tcltk/gis.m/script/r.reclass.rules grass-6.1.0/gui/tcltk/gis.m/script/r.reclass.rules
---- grass-6.1.0~/gui/tcltk/gis.m/script/r.reclass.rules 2006-07-07 02:34:32.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/gis.m/script/r.reclass.rules 2006-08-24 20:03:30.000000000 +0200
-@@ -42,4 +42,4 @@
- exec g.parser "$0" "$@"
- fi
-
--exec xterm -e "$GISBASE/etc/grass-run.sh" r.reclass "input=$GIS_OPT_INPUT" "output=$GIS_OPT_OUTPUT"
-+exec x-terminal-emulator -e "$GISBASE/etc/grass-run.sh" r.reclass "input=$GIS_OPT_INPUT" "output=$GIS_OPT_OUTPUT"
-diff -urNad grass-6.1.0~/gui/tcltk/gis.m/script/r.recode.rules grass-6.1.0/gui/tcltk/gis.m/script/r.recode.rules
---- grass-6.1.0~/gui/tcltk/gis.m/script/r.recode.rules 2006-07-07 02:34:32.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/gis.m/script/r.recode.rules 2006-08-24 20:03:53.000000000 +0200
-@@ -40,4 +40,4 @@
- exec g.parser "$0" "$@"
- fi
-
--exec xterm -e "$GISBASE/etc/grass-run.sh" r.recode "input=$GIS_OPT_INPUT" "output=$GIS_OPT_OUTPUT"
-+exec x-terminal-emulator -e "$GISBASE/etc/grass-run.sh" r.recode "input=$GIS_OPT_INPUT" "output=$GIS_OPT_OUTPUT"
-diff -urNad grass-6.1.0~/gui/tcltk/gis.m/script/r.support.sh grass-6.1.0/gui/tcltk/gis.m/script/r.support.sh
---- grass-6.1.0~/gui/tcltk/gis.m/script/r.support.sh 2006-07-22 11:29:48.000000000 +0200
-+++ grass-6.1.0/gui/tcltk/gis.m/script/r.support.sh 2006-08-24 20:03:40.000000000 +0200
-@@ -35,4 +35,4 @@
- exec g.parser "$0" "$@"
- fi
-
--eval `exec xterm -e r.support map=$GIS_OPT_INPUT`
-+eval `exec x-terminal-emulator -e r.support map=$GIS_OPT_INPUT`
-diff -urNad grass-6.1.0~/lib/gtcltk/gronsole.tcl grass-6.1.0/lib/gtcltk/gronsole.tcl
---- grass-6.1.0~/lib/gtcltk/gronsole.tcl 2006-07-22 11:34:42.000000000 +0200
-+++ grass-6.1.0/lib/gtcltk/gronsole.tcl 2006-08-24 20:05:36.000000000 +0200
-@@ -497,7 +497,7 @@
-
- Gronsole::annotate $path $cmd [concat xterm $tags]
-
-- exec -- xterm -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd &
-+ exec -- x-terminal-emulator -name xterm-grass -e $env(GISBASE)/etc/grass-run.sh $cmd &
-
- update idletasks
- }
-diff -urNad grass-6.1.0~/lib/init/epsg_option.tcl.in grass-6.1.0/lib/init/epsg_option.tcl.in
---- grass-6.1.0~/lib/init/epsg_option.tcl.in 2006-05-16 05:49:01.000000000 +0200
-+++ grass-6.1.0/lib/init/epsg_option.tcl.in 2006-08-24 20:04:50.000000000 +0200
-@@ -147,7 +147,7 @@
- if {[file exists $browsedepsg]== 1} {
- if {[file exists $thelocation ]==0} {
- destroy .optPopup;
-- exec -- xterm -e $env(GISBASE)/etc/make_location_epsg.sh \
-+ exec -- x-terminal-emulator -e $env(GISBASE)/etc/make_location_epsg.sh \
- $epsg_code $epsgLocation $locpath >@stdout 2>@stderr;
- DialogGen .wrnDlg [G_msg "WARNING: restart GRASS please"] warning \
- [G_msg "WARNING: Please restart GRASS in order find the created location in the list (closing it for you now)"] \
-diff -urNad grass-6.1.0~/scripts/r.mapcalculator/r.mapcalculator grass-6.1.0/scripts/r.mapcalculator/r.mapcalculator
---- grass-6.1.0~/scripts/r.mapcalculator/r.mapcalculator 2006-08-24 19:57:37.000000000 +0200
-+++ grass-6.1.0/scripts/r.mapcalculator/r.mapcalculator 2006-08-24 20:05:42.000000000 +0200
-@@ -137,7 +137,7 @@
- # use old style mapcalc
-
- if [ $GIS_FLAG_E = 1 ] ; then
-- exec xterm -e r.mapcalc &
-+ exec x-terminal-emulator -e r.mapcalc &
- exit 0
- fi
-
-diff -urNad grass-6.1.0~/scripts/r3.mapcalculator/r3.mapcalculator grass-6.1.0/scripts/r3.mapcalculator/r3.mapcalculator
---- grass-6.1.0~/scripts/r3.mapcalculator/r3.mapcalculator 2006-08-24 19:57:37.000000000 +0200
-+++ grass-6.1.0/scripts/r3.mapcalculator/r3.mapcalculator 2006-08-24 20:05:56.000000000 +0200
-@@ -130,7 +130,7 @@
- # use old style mapcalc
-
- if [ $GIS_FLAG_E = 1 ] ; then
-- exec xterm -e r3.mapcalc &
-+ exec x-terminal-emulator -e r3.mapcalc &
- exit 0
- fi
-
Modified: packages/grass/branches/6.2~beta1/debian/rules
===================================================================
--- packages/grass/branches/6.2~beta1/debian/rules 2006-08-29 08:29:15 UTC (rev 552)
+++ packages/grass/branches/6.2~beta1/debian/rules 2006-08-29 08:34:19 UTC (rev 553)
@@ -88,7 +88,7 @@
rm -f tools/timer/main.o
rm -f raster/r.le/r.le.setup/polytocell/*.o
rm -f raster/r.terraflow/IOStream/lib/src/libiostream.a
- rm -f debian/grass61.1
+ rm -f debian/grass62.1
rm -f error.log
# clean doxygen documentation (programming man)
rm -rf doxygenhtml lib/vector/html lib/db/html lib/gis/html \
@@ -133,7 +133,7 @@
rm -f debian/tmp/usr/lib/grass/bwidget/LICENSE.txt
# change section from 1 to .1grass
- mv debian/tmp/usr/lib/grass/man/man1/grass6.1 debian/grass61.1
+ mv debian/tmp/usr/lib/grass/man/man1/grass6.1 debian/grass62.1
for m in debian/tmp/usr/lib/grass/man/man1/*.1; do n=`basename $$m .1`; mv $$m debian/tmp/usr/lib/grass/man/man1/$$n.1grass; done
for m in debian/tmp/usr/lib/grass/man/man1/*.1grass; do sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' $$m; done
@@ -176,7 +176,7 @@
dh_installdocs -a
dh_installexamples -a
dh_install --sourcedir=debian/tmp -a
- dh_installman -pgrass debian/grass61.1 -a
+ dh_installman -pgrass debian/grass62.1 -a
dh_link -a
dh_strip -a
dh_compress -a
More information about the Pkg-grass-devel
mailing list