[DebianGIS-dev] r1115 - in packages/grass/branches/6.3/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Wed Sep 26 12:56:28 UTC 2007
Author: frankie
Date: 2007-09-26 12:56:28 +0000 (Wed, 26 Sep 2007)
New Revision: 1115
Modified:
packages/grass/branches/6.3/debian/changelog
packages/grass/branches/6.3/debian/grass.install
packages/grass/branches/6.3/debian/grass.links
packages/grass/branches/6.3/debian/patches/htmlgen-fakeroot.dpatch
packages/grass/branches/6.3/debian/patches/pager.dpatch
packages/grass/branches/6.3/debian/patches/www-browser.dpatch
packages/grass/branches/6.3/debian/patches/xterm.dpatch
packages/grass/branches/6.3/debian/rules
Log:
First issue of the development branch
Modified: packages/grass/branches/6.3/debian/changelog
===================================================================
--- packages/grass/branches/6.3/debian/changelog 2007-09-26 12:52:43 UTC (rev 1114)
+++ packages/grass/branches/6.3/debian/changelog 2007-09-26 12:56:28 UTC (rev 1115)
@@ -1,3 +1,13 @@
+grass (6.3~20070922-1) NOT-FOR-RELEASE; urgency=low
+
+ -- THIS IS A NOT FOR RELEASE BRANCH OF THE MAIN DEVELOPMENT TREE --
+
+ * Branching for 6.3 (development series).
+ * Revised all 6.2.2 patches.
+ * This version is usable in both lenny and sid currently.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Wed, 26 Sep 2007 12:43:12 +0200
+
grass (6.2.2-2) unstable; urgency=medium
* Moved priority to optional. Thanks Ganneff.
Modified: packages/grass/branches/6.3/debian/grass.install
===================================================================
--- packages/grass/branches/6.3/debian/grass.install 2007-09-26 12:52:43 UTC (rev 1114)
+++ packages/grass/branches/6.3/debian/grass.install 2007-09-26 12:56:28 UTC (rev 1115)
@@ -1,4 +1,4 @@
-usr/bin/grass62
+usr/bin/grass63
usr/lib/grass/bin
usr/lib/grass/bwidget
usr/lib/grass/driver
Modified: packages/grass/branches/6.3/debian/grass.links
===================================================================
--- packages/grass/branches/6.3/debian/grass.links 2007-09-26 12:52:43 UTC (rev 1114)
+++ packages/grass/branches/6.3/debian/grass.links 2007-09-26 12:56:28 UTC (rev 1115)
@@ -1,2 +1,2 @@
-usr/bin/grass62 usr/bin/grass
-usr/share/man/man1/grass62.1.gz usr/share/man/man1/grass.1.gz
+usr/bin/grass63 usr/bin/grass
+usr/share/man/man1/grass63.1.gz usr/share/man/man1/grass.1.gz
Modified: packages/grass/branches/6.3/debian/patches/htmlgen-fakeroot.dpatch
===================================================================
--- packages/grass/branches/6.3/debian/patches/htmlgen-fakeroot.dpatch 2007-09-26 12:52:43 UTC (rev 1114)
+++ packages/grass/branches/6.3/debian/patches/htmlgen-fakeroot.dpatch 2007-09-26 12:56:28 UTC (rev 1115)
@@ -7,13 +7,13 @@
## DP: pages from being built.
@DPATCH@
-diff -urNad grass-6.2.2~/include/Make/Html.make grass-6.2.2/include/Make/Html.make
---- grass-6.2.2~/include/Make/Html.make 2007-04-11 15:29:16.000000000 +0200
-+++ grass-6.2.2/include/Make/Html.make 2007-04-11 15:30:48.000000000 +0200
-@@ -92,7 +92,7 @@
- GISBASE=$(GISBASE) \
- PATH=$(GISBASE)/bin:$$PATH \
- $(LD_LIBRARY_PATH_VAR)="$(GISBASE)/lib:$($(LD_LIBRARY_PATH_VAR))" \
+diff -urNad grass-6.3~20070922~/include/Make/Html.make grass-6.3~20070922/include/Make/Html.make
+--- grass-6.3~20070922~/include/Make/Html.make 2007-05-12 06:20:06.000000000 +0200
++++ grass-6.3~20070922/include/Make/Html.make 2007-09-26 11:25:39.000000000 +0200
+@@ -44,7 +44,7 @@
+ GISBASE=$(RUN_GISBASE) \
+ PATH="$(BIN):$$PATH" \
+ $(LD_LIBRARY_PATH_VAR)="$(BIN):$(ARCH_LIBDIR):$($(LD_LIBRARY_PATH_VAR))" \
- 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
Modified: packages/grass/branches/6.3/debian/patches/pager.dpatch
===================================================================
--- packages/grass/branches/6.3/debian/patches/pager.dpatch 2007-09-26 12:52:43 UTC (rev 1114)
+++ packages/grass/branches/6.3/debian/patches/pager.dpatch 2007-09-26 12:56:28 UTC (rev 1115)
@@ -5,21 +5,21 @@
## DP: No description.
@DPATCH@
-diff -urNad grass-6.2.2~/lib/init/init.sh grass-6.2.2/lib/init/init.sh
---- grass-6.2.2~/lib/init/init.sh 2007-04-11 15:35:35.000000000 +0200
-+++ grass-6.2.2/lib/init/init.sh 2007-04-11 15:37:48.000000000 +0200
-@@ -173,10 +173,12 @@
+diff -urNad grass-6.3~20070922~/lib/init/init.sh grass-6.3~20070922/lib/init/init.sh
+--- grass-6.3~20070922~/lib/init/init.sh 2007-09-26 11:30:17.000000000 +0200
++++ grass-6.3~20070922/lib/init/init.sh 2007-09-26 11:32:48.000000000 +0200
+@@ -229,10 +229,12 @@
# Set some environment variables if they are not set
if [ ! "$GRASS_PAGER" ] ; then
- if [ -x /bin/more ] || [ -x /usr/bin/more ] ; then
- GRASS_PAGER=more
+ if [ -x /usr/bin/pager ] ; then
-+ GRASS_PAGER=pager
++ GRASS_PAGER=pager
elif [ -x /bin/less ] || [ -x /usr/bin/less ] ; then
GRASS_PAGER=less
+ elif [ -x /bin/more ] || [ -x /usr/bin/more ] ; then
-+ GRASS_PAGER=more
++ GRASS_PAGER=more
+ elif [ "$MINGW" ] ; then
+ GRASS_PAGER=more
else
- GRASS_PAGER=cat
- fi
Modified: packages/grass/branches/6.3/debian/patches/www-browser.dpatch
===================================================================
--- packages/grass/branches/6.3/debian/patches/www-browser.dpatch 2007-09-26 12:52:43 UTC (rev 1114)
+++ packages/grass/branches/6.3/debian/patches/www-browser.dpatch 2007-09-26 12:56:28 UTC (rev 1115)
@@ -5,18 +5,35 @@
## DP: Use www-browser as HTML browser, the Debian way
@DPATCH@
-diff -urNad grass-6.2.2~/lib/init/init.sh grass-6.2.2/lib/init/init.sh
---- grass-6.2.2~/lib/init/init.sh 2007-04-11 15:31:19.000000000 +0200
-+++ grass-6.2.2/lib/init/init.sh 2007-04-11 15:33:57.000000000 +0200
-@@ -228,53 +228,11 @@
- CYGWIN=`uname | grep CYGWIN`
+diff -urNad grass-6.3~20070922~/lib/init/init.sh grass-6.3~20070922/lib/init/init.sh
+--- grass-6.3~20070922~/lib/init/init.sh 2007-09-22 06:20:09.000000000 +0200
++++ grass-6.3~20070922/lib/init/init.sh 2007-09-26 11:29:39.000000000 +0200
+@@ -263,64 +263,11 @@
+ # try and find a web browser if one isn't already specified
if [ ! "$GRASS_HTML_BROWSER" ] ; then
-- for i in `echo "$PATH" | sed 's/^:/.:/
+-
+- if [ "$MACOSX" ] ; then
+- # OSX doesn't execute browsers from the shell PATH - route thru a script
+- GRASS_HTML_BROWSER="$ETC/html_browser_mac.sh"
+- GRASS_HTML_BROWSER_MACOSX="-b com.apple.helpviewer"
+- export GRASS_HTML_BROWSER_MACOSX
+-
+- elif [ "$MINGW" -o "$CYGWIN" ] ; then
+- # MinGW startup moved to into init.bat
+- iexplore="$SYSTEMDRIVE/Program Files/Internet Explorer/iexplore.exe"
+- if [ -f "$iexplore" ] ; then
+- GRASS_HTML_BROWSER=$iexplore
+- else
+- GRASS_HTML_BROWSER="iexplore"
+- fi
+-
+- else
+- for i in `echo "$PATH" | sed 's/^:/.:/
- s/::/:.:/g
- s/:$/:./
- s/:/ /g'`
-- do
+- do
- if [ -f "$i/htmlview" ] ; then
- GRASS_HTML_BROWSER=htmlview
- break
@@ -35,35 +52,29 @@
- elif [ -f "$i/netscape" ] ; then
- GRASS_HTML_BROWSER=netscape
- break
-- elif [ "$HOSTTYPE" = "macintosh" -o "$HOSTTYPE" = "powermac" -o "$HOSTTYPE" = "powerpc" ] ; then
-- GRASS_HTML_BROWSER=open
-- break
-- elif [ "$HOSTTYPE" = "arm" ] ; then
+- elif [ -f "$i/dillo" ] ; then
- GRASS_HTML_BROWSER=dillo
- break
-- elif [ "$HOSTTYPE" = "arm" ] ; then
-- GRASS_HTML_BROWSER=dillo2
-- break
-- elif [ "$CYGWIN" ] ; then
-- iexplore="$SYSTEMDRIVE/Program Files/Internet Explorer/iexplore.exe"
-- if [ -f "$iexplore" ] ; then
-- GRASS_HTML_BROWSER=$iexplore
-- else
-- GRASS_HTML_BROWSER="iexplore"
-- fi
-- break
- fi
-- done
+- done
+- fi
+-
+-elif [ "$MACOSX" ] ; then
+- # OSX doesn't execute browsers from the shell PATH - route thru a script
+- GRASS_HTML_BROWSER_MACOSX="-b $GRASS_HTML_BROWSER"
+- export GRASS_HTML_BROWSER_MACOSX
+- GRASS_HTML_BROWSER="$ETC/html_browser_mac.sh"
-fi
+-
-if [ ! "$GRASS_HTML_BROWSER" ] ; then
-- echo "Searching for web browser, but neither konqueror, nor mozilla, opera, netscape found."
-- # so we set konqueror, though, to make lib/gis/parser.c happy:
+- echo "WARNING: Searched for a web browser, but none found." 1>&2
+- # even so we set konqueror to make lib/gis/parser.c happy:
- GRASS_HTML_BROWSER=konqueror
-+ if [ -x /usr/bin/x-www-browser ] ; then
-+ GRASS_HTML_BROWSER=x-www-browser
++ if [ -x /usr/bin/x-www-browser ] ; then
++ GRASS_HTML_BROWSER=x-www-browser
+ else
-+ GRASS_HTML_BROWSER=true
-+ fi
++ GRASS_HTML_BROWSER=true
++ fi
fi
export GRASS_HTML_BROWSER
Modified: packages/grass/branches/6.3/debian/patches/xterm.dpatch
===================================================================
--- packages/grass/branches/6.3/debian/patches/xterm.dpatch 2007-09-26 12:52:43 UTC (rev 1114)
+++ packages/grass/branches/6.3/debian/patches/xterm.dpatch 2007-09-26 12:56:28 UTC (rev 1115)
@@ -5,15 +5,98 @@
## DP: No description.
@DPATCH@
-diff -urNad grass-6.2.1~/lib/init/grass-xterm-wrapper grass-6.2.1/lib/init/grass-xterm-wrapper
---- grass-6.2.1~/lib/init/grass-xterm-wrapper 2006-08-31 15:59:08.000000000 +0200
-+++ grass-6.2.1/lib/init/grass-xterm-wrapper 2007-05-17 18:30:48.000000000 +0200
-@@ -2,7 +2,7 @@
- # script to wrap xterm
+diff -urNad grass-6.3~20070922~/lib/init/grass-xterm-wrapper grass-6.3~20070922/lib/init/grass-xterm-wrapper
+--- grass-6.3~20070922~/lib/init/grass-xterm-wrapper 2007-09-15 06:20:08.000000000 +0200
++++ grass-6.3~20070922/lib/init/grass-xterm-wrapper 2007-09-26 11:44:47.000000000 +0200
+@@ -2,89 +2,8 @@
+ # script to wrap xterm
+ # handles OSX Terminal as a special emulated case
+-SYSTEM=`uname -s`
+-case $SYSTEM in
+-Darwin*)
+- MACOSX=1
+- ;;
+-esac
+-
if [ -z "$GRASS_XTERM" ] ; then
-- GRASS_XTERM=xterm
-+ GRASS_XTERM=x-terminal-emulator
+- if [ "$MACOSX" ] ; then
+- GRASS_XTERM=Terminal.app
+- else
+- GRASS_XTERM=xterm
+- fi
++ GRASS_XTERM=x-terminal-emulator
fi
- # run command
+-case $GRASS_XTERM in
+-*xterm)
+- # the basic way or on other platform than OSX - run command
+- exec $GRASS_XTERM "$@"
+- ;;
+-*Terminal.app)
+- # manually transfer the necessary env vars
+- TMPSCRIPT="/tmp/grassxterm_$$"
+- touch "$TMPSCRIPT.sh"
+- chmod +x "$TMPSCRIPT.sh"
+- echo "#!/bin/sh" > "$TMPSCRIPT.sh"
+-
+- echo "DISPLAY=$DISPLAY" >> "$TMPSCRIPT.sh"
+- echo "PATH=\"$PATH\"" >> "$TMPSCRIPT.sh"
+- echo "GIS_LOCK=\"$GIS_LOCK\"" >> "$TMPSCRIPT.sh"
+- echo "GISRC=\"$GISRC\"" >> "$TMPSCRIPT.sh"
+- echo "GISBASE=\"$GISBASE\"" >> "$TMPSCRIPT.sh"
+- echo "GRASS_VERSION=\"$GRASS_VERSION\"" >> "$TMPSCRIPT.sh"
+- echo "GRASS_PAGER=$GRASS_PAGER" >> "$TMPSCRIPT.sh"
+- echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"" >> "$TMPSCRIPT.sh"
+- echo "GRASS_LD_LIBRARY_PATH=\"$GRASS_LD_LIBRARY_PATH\"" >> "$TMPSCRIPT.sh"
+- echo "GRASS_WISH=\"$GRASS_WISH\"" >> "$TMPSCRIPT.sh"
+- echo "GRASS_TCLSH=\"$GRASS_TCLSH\"" >> "$TMPSCRIPT.sh"
+- echo "GRASS_HTML_BROWSER=\"$GRASS_HTML_BROWSER\"" >> "$TMPSCRIPT.sh"
+- echo "GRASS_HTML_BROWSER_MACOSX=\"$GRASS_HTML_BROWSER_MACOSX\"" >> "$TMPSCRIPT.sh"
+- echo "export DISPLAY PATH GIS_LOCK GISRC GISBASE GRASS_VERSION GRASS_PAGER DYLD_LIBRARY_PATH GRASS_LD_LIBRARY_PATH GRASS_WISH GRASS_TCLSH GRASS_HTML_BROWSER GRASS_HTML_BROWSER_MACOSX" >> "$TMPSCRIPT.sh"
+- if [ "$GRASS_ADDON_PATH" ] ; then
+- echo "GRASS_ADDON_PATH=\"$GRASS_ADDON_PATH\"" >> "$TMPSCRIPT.sh"
+- echo "export GRASS_ADDON_PATH" >> "$TMPSCRIPT.sh"
+- fi
+- if [ "$TCL_LIBRARY" ] ; then
+- echo "TCL_LIBRARY=\"$TCL_LIBRARY\"" >> "$TMPSCRIPT.sh"
+- echo "export TCL_LIBRARY" >> "$TMPSCRIPT.sh"
+- fi
+- if [ "$TK_LIBRARY" ] ; then
+- echo "TK_LIBRARY=\"$TK_LIBRARY\"" >> "$TMPSCRIPT.sh"
+- echo "export TK_LIBRARY" >> "$TMPSCRIPT.sh"
+- fi
+-
+- # get command, ignore all other xterm flags
+- while true ; do
+- if [ "$1" = "-e" ] ; then break ; fi
+- shift
+- done
+- shift
+- # and add it to end of script
+- echo "$@" >> "$TMPSCRIPT.sh"
+-
+- # execute
+- # save current active app/window, return to it when script finishes.
+- osascript - <<EOF
+---tell application "System Events"
+--- set save_app to item 1 of (get name of processes whose frontmost is true)
+---end tell
+-tell application "Terminal"
+- activate
+- -- start new window with env/cmd script
+- do script "$TMPSCRIPT.sh; exit"
+- tell window 1
+- -- wait for it to finish
+- repeat while (processes is not equal to {})
+- delay 1
+- end repeat
+- close
+- end tell
+-end tell
+---tell application save_app to activate
+-EOF
+- rm -f "$TMPSCRIPT.sh"
+- ;;
+-esac
++exec $GRASS_XTERM "$@"
Modified: packages/grass/branches/6.3/debian/rules
===================================================================
--- packages/grass/branches/6.3/debian/rules 2007-09-26 12:52:43 UTC (rev 1114)
+++ packages/grass/branches/6.3/debian/rules 2007-09-26 12:56:28 UTC (rev 1115)
@@ -92,7 +92,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/grass62.1
+ rm -f debian/grass63.1
rm -f error.log
# clean doxygen documentation (programming man)
rm -rf doxygenhtml lib/vector/html lib/db/html lib/gis/html \
@@ -137,7 +137,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/grass62.1
+ mv debian/tmp/usr/lib/grass/man/man1/grass6.1 debian/grass63.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
@@ -186,7 +186,7 @@
dh_installdocs -a
dh_installexamples -a
dh_install --sourcedir=debian/tmp -a
- dh_installman -pgrass debian/grass62.1 -a
+ dh_installman -pgrass debian/grass63.1 -a
dh_link -a
dh_strip -a
dh_compress -a
More information about the Pkg-grass-devel
mailing list