[DebianGIS-dev] r1712 - in packages/grass/branches/6.3/debian: . patches

frankie at alioth.debian.org frankie at alioth.debian.org
Thu Jul 10 11:09:43 UTC 2008


Author: frankie
Date: 2008-07-10 11:09:42 +0000 (Thu, 10 Jul 2008)
New Revision: 1712

Added:
   packages/grass/branches/6.3/debian/files
   packages/grass/branches/6.3/debian/grass-preview-dev.dirs
   packages/grass/branches/6.3/debian/grass-preview-dev.install
   packages/grass/branches/6.3/debian/grass-preview-doc.dirs
   packages/grass/branches/6.3/debian/grass-preview-doc.install
   packages/grass/branches/6.3/debian/grass-preview-doc.links
   packages/grass/branches/6.3/debian/grass-preview.dirs
   packages/grass/branches/6.3/debian/grass-preview.install
   packages/grass/branches/6.3/debian/grass-preview.postinst
   packages/grass/branches/6.3/debian/grass-preview.postrm
   packages/grass/branches/6.3/debian/grass63.1
Removed:
   packages/grass/branches/6.3/debian/grass-dev.dirs
   packages/grass/branches/6.3/debian/grass-dev.install
   packages/grass/branches/6.3/debian/grass-doc.dirs
   packages/grass/branches/6.3/debian/grass-doc.install
   packages/grass/branches/6.3/debian/grass-doc.links
   packages/grass/branches/6.3/debian/grass.dirs
   packages/grass/branches/6.3/debian/grass.install
   packages/grass/branches/6.3/debian/grass.links
   packages/grass/branches/6.3/debian/grass.postinst
   packages/grass/branches/6.3/debian/grass.postrm
Modified:
   packages/grass/branches/6.3/debian/TODO
   packages/grass/branches/6.3/debian/changelog
   packages/grass/branches/6.3/debian/control
   packages/grass/branches/6.3/debian/fixscripts.sh
   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
   packages/grass/branches/6.3/debian/watch
Log:
Moved to grass-preview


Modified: packages/grass/branches/6.3/debian/TODO
===================================================================
--- packages/grass/branches/6.3/debian/TODO	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/TODO	2008-07-10 11:09:42 UTC (rev 1712)
@@ -4,3 +4,7 @@
 The grass 'etc' directory contains a mixed arch/non-arch depending mess of files. They should
 be automatically classified in the install target and moved to /var/lib/grass or /usr/lib/grass, 
 leaving symlinks to do not break things.
+
+Current preview version does not build the new wxwidget GUI due to missing non-experimental
+support of WxWidget 2.8 and its python bindings. For the same reason python build-deps
+are missing.

Modified: packages/grass/branches/6.3/debian/changelog
===================================================================
--- packages/grass/branches/6.3/debian/changelog	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/changelog	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,3 +1,18 @@
+grass-preview (6.3.0-1) UNRELEASED; urgency=low
+
+  * Changing source package name to grass-preview.
+    Starting from this release the package is tought to co-exist with the
+    stable 6.2 branch (6.2.3).
+  * Merged changes from stable branches:
+  	- Vcs-* fields in debian/control.
+        - Current list of build-deps.
+        - Tcl policy changes.
+  * Revised current patchset to reflect changes in source code.
+  * Removed obsolete NEWS file.
+  * Updated TODO to document missing wxwidget GUI.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Jul 2008 13:08:59 +0200
+
 grass (6.3~20070922-1) NOT-FOR-RELEASE; urgency=low
 
   -- THIS IS A NOT FOR RELEASE BRANCH OF THE MAIN DEVELOPMENT TREE --

Modified: packages/grass/branches/6.3/debian/control
===================================================================
--- packages/grass/branches/6.3/debian/control	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/control	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,35 +1,37 @@
-Source: grass
+Source: grass-preview
 Section: science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Steve Halasz <debian at adkgis.org>
 Build-depends: flex, bison, libreadline5-dev | libreadline-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 5), dpatch, 
- libtiff4-dev, tcl8.4-dev, tk8.4-dev, fftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev,
+ libtiff4-dev, tcl-dev (>= 8.4) | tcl8.4-dev, tk-dev (>= 8.4) | tk8.4-dev, libfftw3-dev|fftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev, 
  libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>=1.4.0) | libgdal1-1.3.2-dev, proj (>= 4.4.7), libjpeg62-dev, 
  libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev 
-Standards-Version: 3.7.2
-Homepage: http://grass.itc.it/
+Standards-Version: 3.7.3
+Homepage: http://grass.osgeo.org/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/grass/
+Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/grass/
 
-Package: grass
+Package: grass-preview
 Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator
-Provides: libgrass
-Conflicts: libgrass
-Replaces: libgrass
-Suggests: grass-doc, gdal-bin, e00compr, avce00, gpstrans, gnuplot
-Description: Geographic Resources Analysis Support System
+Suggests: grass-preview-doc, gdal-bin, e00compr, avce00, gpstrans, gnuplot, grass-doc
+Description: Geographic Resources Analysis Support System (Technology Preview)
  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
  visualization. GRASS is currently used in academic and commercial
  settings around the world, as well as by many government agencies
  and environmental consulting companies.
+ .
+ This is a technology preview version. It could be broken on some respects,
+ use `grass' package if you need a stable one. 
 
-Package: grass-doc
+Package: grass-preview-doc
 Section: science
 Architecture: all
-Description: Geographic Resources Analysis Support System documentation
+Description: Geographic Resources Analysis Support System (Technology Preview) documentation
  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
@@ -38,16 +40,16 @@
  and environmental consulting companies.
  .
  This package contains HTML documentation for the GRASS system.
+ .
+ This is a technology preview version. It could be broken on some respects,
+ use `grass-doc' package if you need the stable version documentation. 
 
-Package: grass-dev
+Package: grass-preview-dev
 Section: devel
 Architecture: any
-Depends: ${shlibs:Depends}, grass (= ${Source-Version})
-Provides: libgrass-dev
-Conflicts: libgrass-dev
-Replaces: libgrass-dev
+Depends: ${shlibs:Depends}, grass-preview (= ${binary:Version})
 Suggests: pkg-config
-Description: GRASS GIS development files
+Description: GRASS GIS (Technology preview) development files
  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
@@ -58,3 +60,6 @@
  This package contains the header files for developing with GRASS.
  Install this package if you wish to develop software that manipulates
  GRASS data sets.
+ .
+ This is a technology preview version. It could be broken on some respects,
+ use `grass-dev' package if you need the stable version documentation. 

Added: packages/grass/branches/6.3/debian/files
===================================================================
--- packages/grass/branches/6.3/debian/files	                        (rev 0)
+++ packages/grass/branches/6.3/debian/files	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1,3 @@
+grass-preview-doc_6.3.0-1_all.deb science optional
+grass-preview_6.3.0-1_i386.deb science optional
+grass-preview-dev_6.3.0-1_i386.deb devel optional

Modified: packages/grass/branches/6.3/debian/fixscripts.sh
===================================================================
--- packages/grass/branches/6.3/debian/fixscripts.sh	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/fixscripts.sh	2008-07-10 11:09:42 UTC (rev 1712)
@@ -8,7 +8,7 @@
 # make these scripts executable
 for x in etc/water/seg
 do
-    chmod +x $CURDIR/debian/tmp/usr/lib/grass/$x
+    chmod +x $CURDIR/debian/tmp/usr/lib/grass63/$x
 done
 
 # silence bogus lintian complaint about interpreter-not-absolute
@@ -18,15 +18,15 @@
     script_file_tools \
     nviz2.2_script
 do
-  f=$CURDIR/debian/tmp/usr/lib/grass/etc/nviz2.2/scripts/$x
-  sed 's.!nviz.!/usr/lib/grass/bin/nviz.' $f >foo && cat foo >$f
+  f=$CURDIR/debian/tmp/usr/lib/grass63/etc/nviz2.2/scripts/$x
+  sed 's.!nviz.!/usr/lib/grass63/bin/nviz.' $f >foo && cat foo >$f
 done
 
 for x in panel_label.tcl \
     panel_scale.tcl
 do
-  f=$CURDIR/debian/tmp/usr/lib/grass/etc/nviz2.2/scripts/$x
-  sed 's%!../glnviz.new/nvwish%!/usr/lib/grass/etc/nviz2.2/glnviz/nvwish%' $f >foo && cat foo >$f
+  f=$CURDIR/debian/tmp/usr/lib/grass63/etc/nviz2.2/scripts/$x
+  sed 's%!../glnviz.new/nvwish%!/usr/lib/grass63/etc/nviz2.2/glnviz/nvwish%' $f >foo && cat foo >$f
 done
 rm foo
 
@@ -34,7 +34,7 @@
 # add shebang to scripts that need it
 for x in etc/copy
 do
-  f=$CURDIR/debian/tmp/usr/lib/grass/$x
+  f=$CURDIR/debian/tmp/usr/lib/grass63/$x
   cp $f foo; echo "#!/bin/sh" >$f; cat foo >>$f
 done
 rm foo
@@ -98,5 +98,5 @@
     etc/nviz2.2/scripts/wirecolorPopup.tcl \
     etc/nviz2.2/scripts/fileBrowser.tcl
 do
-    chmod -x $CURDIR/debian/tmp/usr/lib/grass/$x
+    chmod -x $CURDIR/debian/tmp/usr/lib/grass63/$x
 done

Deleted: packages/grass/branches/6.3/debian/grass-dev.dirs
===================================================================
--- packages/grass/branches/6.3/debian/grass-dev.dirs	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass-dev.dirs	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,3 +0,0 @@
-usr/lib/grass/include
-usr/lib/grass/include/Make
-usr/share/pkgconfig

Deleted: packages/grass/branches/6.3/debian/grass-dev.install
===================================================================
--- packages/grass/branches/6.3/debian/grass-dev.install	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass-dev.install	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1 +0,0 @@
-usr/lib/grass/include

Deleted: packages/grass/branches/6.3/debian/grass-doc.dirs
===================================================================
--- packages/grass/branches/6.3/debian/grass-doc.dirs	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass-doc.dirs	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,4 +0,0 @@
-usr/share/doc/grass-doc
-usr/share/doc/grass-doc/programming-manual
-usr/share/doc/grass-doc/programming-manual/html
-usr/share/man

Deleted: packages/grass/branches/6.3/debian/grass-doc.install
===================================================================
--- packages/grass/branches/6.3/debian/grass-doc.install	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass-doc.install	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,5 +0,0 @@
-usr/lib/grass/docs/html usr/share/doc/grass-doc
-usr/lib/grass/man/man1 usr/share/man
-programming-manual/db usr/share/doc/grass-doc/programming-manual/html
-programming-manual/gis usr/share/doc/grass-doc/programming-manual/html
-programming-manual/vector usr/share/doc/grass-doc/programming-manual/html

Deleted: packages/grass/branches/6.3/debian/grass-doc.links
===================================================================
--- packages/grass/branches/6.3/debian/grass-doc.links	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass-doc.links	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1 +0,0 @@
-usr/share/doc/grass-doc/html usr/lib/grass/docs/html

Added: packages/grass/branches/6.3/debian/grass-preview-dev.dirs
===================================================================
--- packages/grass/branches/6.3/debian/grass-preview-dev.dirs	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass-preview-dev.dirs	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1,3 @@
+usr/lib/grass63/include
+usr/lib/grass63/include/Make
+usr/share/pkgconfig

Added: packages/grass/branches/6.3/debian/grass-preview-dev.install
===================================================================
--- packages/grass/branches/6.3/debian/grass-preview-dev.install	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass-preview-dev.install	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1 @@
+usr/lib/grass63/include

Added: packages/grass/branches/6.3/debian/grass-preview-doc.dirs
===================================================================
--- packages/grass/branches/6.3/debian/grass-preview-doc.dirs	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass-preview-doc.dirs	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1,4 @@
+usr/share/doc/grass-preview-doc
+usr/share/doc/grass-preview-doc/programming-manual
+usr/share/doc/grass-preview-doc/programming-manual/html
+usr/share/man

Added: packages/grass/branches/6.3/debian/grass-preview-doc.install
===================================================================
--- packages/grass/branches/6.3/debian/grass-preview-doc.install	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass-preview-doc.install	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1,5 @@
+usr/lib/grass63/docs/html usr/share/doc/grass-preview-doc
+usr/lib/grass63/man/man1 usr/share/man
+programming-manual/db usr/share/doc/grass-preview-doc/programming-manual/html
+programming-manual/gis usr/share/doc/grass-preview-doc/programming-manual/html
+programming-manual/vector usr/share/doc/grass-preview-doc/programming-manual/html

Added: packages/grass/branches/6.3/debian/grass-preview-doc.links
===================================================================
--- packages/grass/branches/6.3/debian/grass-preview-doc.links	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass-preview-doc.links	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1 @@
+usr/share/doc/grass-doc/html usr/lib/grass/docs/html

Added: packages/grass/branches/6.3/debian/grass-preview.dirs
===================================================================
--- packages/grass/branches/6.3/debian/grass-preview.dirs	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass-preview.dirs	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1,6 @@
+etc/ld.so.conf.d
+usr/lib/grass63
+/usr/bin
+/usr/lib/grass63
+/usr/share/doc/grass63
+/usr/share/man

Added: packages/grass/branches/6.3/debian/grass-preview.install
===================================================================
--- packages/grass/branches/6.3/debian/grass-preview.install	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass-preview.install	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1,8 @@
+usr/bin/grass63
+usr/lib/grass63/bin
+usr/lib/grass63/bwidget
+usr/lib/grass63/driver
+usr/lib/grass63/etc
+usr/lib/grass63/fonts
+usr/lib/grass63/scripts
+usr/lib/grass63/lib

Added: packages/grass/branches/6.3/debian/grass-preview.postinst
===================================================================
--- packages/grass/branches/6.3/debian/grass-preview.postinst	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass-preview.postinst	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Make sure grass libraries are picked up by ldconfig
+# Lifted from xfree86 package's shell-lib.sh script
+
+set -e
+
+# Removes obsolete path in the main ld.so configuration file.
+# This should be removed post-lenny.
+dir="/usr/lib/grass63/lib"
+ldsoconf="/etc/ld.so.conf"
+# is the line present?
+if fgrep -qsx "$dir" "$ldsoconf"; then
+    # rewrite the file (very carefully)
+    set +e
+    fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
+    fgrep_status=$?
+    set -e
+    case $fgrep_status in
+      0|1) ;; # we don't actually care if any lines matched or not
+      *) echo "error reading \"$ldsoconf\"; fgrep exited with status" \
+        "$fgrep_status" && exit 1 ;;
+    esac
+    set +e
+    cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
+    cmp_status=$?
+    set -e
+    case $cmp_status in
+      0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
+      1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
+      *) echo "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\"; cmp" \
+        "exited with status $cmp_status" && exit 2 ;;
+    esac
+fi
+
+if [ "$1" = "configure" ]; then
+  ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
+
+

Added: packages/grass/branches/6.3/debian/grass-preview.postrm
===================================================================
--- packages/grass/branches/6.3/debian/grass-preview.postrm	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass-preview.postrm	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Make sure grass library dir is removed from ld.so.conf
+# Lifted from xfree86 package's shell-lib.sh script
+
+set -e
+
+if [ "$1" = "remove" ]; then
+  rm -f /etc/ld.so.conf.d/grass63.conf
+  ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0

Deleted: packages/grass/branches/6.3/debian/grass.dirs
===================================================================
--- packages/grass/branches/6.3/debian/grass.dirs	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass.dirs	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,6 +0,0 @@
-etc/ld.so.conf.d
-usr/lib/grass
-/usr/bin
-/usr/lib/grass
-/usr/share/doc/grass
-/usr/share/man

Deleted: packages/grass/branches/6.3/debian/grass.install
===================================================================
--- packages/grass/branches/6.3/debian/grass.install	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass.install	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,8 +0,0 @@
-usr/bin/grass63
-usr/lib/grass/bin
-usr/lib/grass/bwidget
-usr/lib/grass/driver
-usr/lib/grass/etc
-usr/lib/grass/fonts
-usr/lib/grass/scripts
-usr/lib/grass/lib

Deleted: packages/grass/branches/6.3/debian/grass.links
===================================================================
--- packages/grass/branches/6.3/debian/grass.links	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass.links	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,2 +0,0 @@
-usr/bin/grass63 usr/bin/grass
-usr/share/man/man1/grass63.1.gz usr/share/man/man1/grass.1.gz

Deleted: packages/grass/branches/6.3/debian/grass.postinst
===================================================================
--- packages/grass/branches/6.3/debian/grass.postinst	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass.postinst	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,43 +0,0 @@
-#!/bin/sh
-# Make sure grass libraries are picked up by ldconfig
-# Lifted from xfree86 package's shell-lib.sh script
-
-set -e
-
-# Removes obsolete path in the main ld.so configuration file.
-# This should be removed post-lenny.
-dir="/usr/lib/grass/lib"
-ldsoconf="/etc/ld.so.conf"
-# is the line present?
-if fgrep -qsx "$dir" "$ldsoconf"; then
-    # rewrite the file (very carefully)
-    set +e
-    fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
-    fgrep_status=$?
-    set -e
-    case $fgrep_status in
-      0|1) ;; # we don't actually care if any lines matched or not
-      *) echo "error reading \"$ldsoconf\"; fgrep exited with status" \
-        "$fgrep_status" && exit 1 ;;
-    esac
-    set +e
-    cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
-    cmp_status=$?
-    set -e
-    case $cmp_status in
-      0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
-      1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
-      *) echo "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\"; cmp" \
-        "exited with status $cmp_status" && exit 2 ;;
-    esac
-fi
-
-if [ "$1" = "configure" ]; then
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
-
-

Deleted: packages/grass/branches/6.3/debian/grass.postrm
===================================================================
--- packages/grass/branches/6.3/debian/grass.postrm	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/grass.postrm	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Make sure grass library dir is removed from ld.so.conf
-# Lifted from xfree86 package's shell-lib.sh script
-
-set -e
-
-if [ "$1" = "remove" ]; then
-  rm -f /etc/ld.so.conf.d/grass.conf
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0

Added: packages/grass/branches/6.3/debian/grass63.1
===================================================================
--- packages/grass/branches/6.3/debian/grass63.1	                        (rev 0)
+++ packages/grass/branches/6.3/debian/grass63.1	2008-07-10 11:09:42 UTC (rev 1712)
@@ -0,0 +1,322 @@
+.TH grass6 1 "" "GRASS 6.3.0" "Grass User's Manual"
+.SH NAME
+\fI\fBgrass63\fR\fR  - The GRASS startup program
+.br
+.SH SYNOPSIS
+\fBgrass63\fR [\fB-\fR] [\fB-v\fR] [\fB-h | -help | --help\fR]
+[\fB-text | -gui | -oldgui]\fR]
+[[[\fB/\fR]\fB/\fR]
+\fB\fR]
+.br
+.SH DESCRIPTION
+.PP
+This program is used to start GRASS. It will parse the command line arguments
+and then initialize GRASS for the user. Since GRASS programs require a
+specific environment, this program must be called before any other GRASS
+program can run. The command line arguments are optional and provide the user
+with a method to indicate the desired user interface, as well as the desired
+mapset to work on.
+.SH FEATURES
+.PP
+The GRASS program will save both the desired user interface and mapset.
+Thus, the next time the user runs GRASS, typing \fIgrass63\fR (without any
+options) will start grass with the previous settings for the user interface
+and mapset.
+.PP
+If you specify a graphical user interface (eg Tcl/Tk) the \fIgrass63\fR
+program will try to verify that the system you specified exists and that you
+can access it successfully. If any of these checks fail, then \fIgrass63\fR
+will automatically switch back to the text user interface mode.
+.SH OPTIONS
+.PP
+All command line options are optional.
+.SS Flags:
+.IP "\fB-\fR
+.br
+ Tries to start GRASS using location environment variables (see below)
+.IP "\fB-h -help --help\fR
+.br
+ Prints a brief usage message
+.IP "\fB-text\fR
+.br
+ Indicates that the text based user interface should be used
+.IP "\fB-gui\fR (or \fB-tcltk\fR)
+.br
+ Indicates that the Tcl/Tk based graphical user interface should be used
+.IP "\fB-oldgui\fR
+.br
+ Indicates that the old graphical user interface should be used (d.m)
+.IP "\fB-v --version\fR
+.br
+ Prints the version for GRASS
+.PP
+.SS Parameters:
+.IP "\fBGISDBASE\fR
+.br
+ Initial database directory which should be a fully qualified path
+(eg /usr/local/share/grassdata)
+.IP "\fBLOCATION_NAME\fR
+.br
+ Initial location directory which is a subdirectory of GISDBASE
+.IP "\fBMAPSET\fR
+.br
+ Initial mapset directory which is a subdirectory of LOCATION_NAME
+.IP "\fBNote\fR
+.br
+ You must specify one of the following
+.br
+MAPSET
+.br
+LOCATION_NAME/MAPSET
+.br
+GISDBASE/LOCATION_NAME/MAPSET
+.br
+.PP
+.SH ENVIRONMENT VARIABLES
+.SS User Interface Environment Variable
+.PP
+The \fIgrass63\fR program will check for the existence of an environment
+variable called GRASS_GUI which indicates the type of user interface for
+GRASS to use. If this variable is not set when \fIgrass63\fR is run, then
+it will be created and then saved in the $HOME/.grassrc6 file for the next
+time GRASS is run. In addition to "text" or "tcltk", the GRASS_GUI variable
+can be set to the name of the GUI to use, for example "gis.m" or "d.m".
+.PP
+There is an order of precedence in the way \fIgrass63\fR determines the user
+interface to use. The following is the hierarchy from highest precedence to
+lowest.
+.PP
+The user may add own environment variable settings to $HOME/.grassrc6 file
+which are used during next startup of GRASS (list of 
+implemented environment variables). 
+.IP "\fBInterface precedence\fR
+.br
+Command line argument
+.br
+Environment variable GRASS_GUI
+.br
+Value set in $HOME/.grassrc6
+.br
+Default value - currently gis.m
+.PP
+.SS Tcl/Tk Environment Variables
+.PP
+If you choose to use the Tcl/Tk graphical user interface, then the following
+environment variables can be used to override your system default tclsh and
+wish commands. See the section immediately following the variable descriptions
+for an example.
+.IP "\fBGRASS_TCLSH\fR
+.br
+ Command to use to override tclsh
+.IP "\fBGRASS_WISH\fR
+.br
+ Command to use to override wish
+.PP
+.SS Example Use of GRASS Tcl/Tk Environment Variables
+.PP
+Suppose your system has Tcl/Tk 8.0 installed and you install your personal
+version of Tcl/Tk 8.3 binaries installed under $HOME/bin. You can use the
+above variables to have GRASS use the Tcl/Tk 8.3 binaries instead.
+.PP
+GRASS_TCLSH = $HOME/bin/tclsh8.3
+.br
+GRASS_WISH  = $HOME/bin/wish8.3
+.SS Addon path to extra local GRASS modules
+This environment variables allows to extend the GRASS paths to locally
+developed/installed modules which are not distributes through the standard
+release of GRASS.
+.PP
+GRASS_ADDON_PATH=/usr/mytools
+.br
+GRASS_ADDON_PATH=/usr/mytools:/usr/local/othertools
+.PP
+In this example above path(s) would be added to the standard GRASS path
+environment.
+.SS Location Environment Variables
+.PP
+The Synopsis and Options sections above describe options that can be used to
+set the location and mapset that GRASS will use. These values can also be set
+with environment variables. However, specifying the location and mapset
+variables on the command line will override these environment variables. The
+available variables are as follows:
+.IP "\fBLOCATION\fR
+.br
+ A fully qualified path to a mapset 
+(eg /usr/local/share/grassdata/spearfish60/PERMANENT). This environment variable
+overrides the GISDBASE, LOCATION_NAME, and MAPSET variables.
+.IP "\fBGISDBASE\fR
+.br
+ Initial database directory which should be a fully qualified path
+(eg /usr/local/share/grassdata)
+.IP "\fBLOCATION_NAME\fR
+.br
+ Initial location directory which is a subdirectory of GISDBASE
+.IP "\fBMAPSET\fR
+.br
+ Initial mapset directory which is a subdirectory of LOCATION_NAME
+.PP
+.PP
+There are a variety of ways in which these variables can be used to specify
+the mapset to use. The following are some possible examples.
+.IP "\fBExample 1\fR
+.br
+ The environment variables are defined as follows:
+.br
+LOCATION = /usr/local/share/grassdata/spearfish60/PERMANENT
+.br
+GISDBASE = /usr/local/share/grassdata
+.br
+LOCATION_NAME = spearfish60
+.br
+MAPSET = PERMANENT
+.br
+Start GRASS with the following command:
+.br
+grass63 -
+.br
+GRASS will start with the mapset defined by LOCATION since the LOCATION
+variable overrides the other variables.
+.br
+.IP "\fBExample 2\fR
+.br
+ The environment variables are defined as follows:
+.br
+GISDBASE = /usr/local/share/grassdata
+.br
+LOCATION_NAME = spearfish60
+.br
+MAPSET = PERMANENT
+.br
+Start GRASS with the following command:
+.br
+grass63 -
+.br
+GRASS will start with the mapset defined by
+GISDBASE/LOCATION_NAME/MAPSET.
+.br
+.IP "\fBExample 3\fR
+.br
+ The environment variables are defined as follows:
+.br
+LOCATION = /usr/local/share/grassdata/spearfish60/PERMANENT
+.br
+GISDBASE = /usr/local/share/grassdata
+.br
+LOCATION_NAME = spearfish60
+.br
+MAPSET = PERMANENT
+.br
+Start GRASS with the following command:
+.br
+grass63 /usr/home/grass/data/thailand/forests
+.br
+GRASS will start with the mapset /home/grass/data/thailand/forests which
+overrides the environment variables.
+.br
+.IP "\fBExample 4\fR
+.br
+ The environment variables are defined as follows:
+.br
+LOCATION = /usr/local/share/grassdata/spearfish60/PERMANENT
+.br
+GISDBASE = /usr/local/share/grassdata
+.br
+LOCATION_NAME = spearfish60
+.br
+MAPSET = PERMANENT
+.br
+Start GRASS with the following command:
+.br
+grass63 swamps
+.br
+GRASS will start with the mapset defined by GISDBASE/LOCATION_NAME/swamps
+since the command line argument for the mapset overrides the environment
+variable MAPSET.
+.br
+.IP "\fBExample 5\fR
+.br
+ The environment variables are defined as follows:
+.br
+LOCATION = /usr/local/share/grassdata/spearfish60/PERMANENT
+.br
+GISDBASE = /usr/local/share/grassdata
+.br
+LOCATION_NAME = spearfish60
+.br
+MAPSET = PERMANENT
+.br
+Start GRASS with the following command:
+.br
+grass63 thailand/forests
+.br
+GRASS will start with the mapset defined by GISDBASE/thailand/forests
+since the command line arguments for the location and mapset overrides
+the environment variables LOCATION_NAME and MAPSET.
+.br
+.PP
+.SS Note
+.PP
+Note that you will need to set these variables using the appropriate method
+required for the UNIX shell that you use.
+.SH EXAMPLES
+.PP
+The following are some examples of how you could start GRASS
+.IP "\fBgrass63\fR
+.br
+ Start GRASS using the default user interface. The user will be prompted
+to choose the appropriate location and mapset.
+.IP "\fBgrass63 -gui\fR
+.br
+ Start GRASS using the Tcl/Tk based user interface. The user will be
+prompted to choose the appropriate location and mapset.
+.IP "\fBgrass63 -text\fR
+.br
+ Start GRASS using the text based user interface. The user will be
+prompted to choose the appropriate location and mapset.
+.IP "\fBgrass63 -gui -\fR
+.br
+ Start GRASS using the Tcl/Tk based user interface and try to obtain
+the location and mapset from environment variables.
+.IP "\fBOther examples\fR
+.br
+ See the \fBLocation Environment Variables\fR section for further
+examples.
+.PP
+.SH BUGS AND CAVEAT
+.PP
+If you start GRASS using the Tcl/Tk interface you must have a \fIwish\fR
+command in your $PATH variable. That is, the command must be named
+\fIwish\fR and not something like \fIwish8.3\fR. By default, a Tcl/Tk
+installation does not create a \fIwish\fR command. Thus, the system
+administrator must create an appropriate link to the actual wish program.
+.PP
+For example, suppose Tcl/Tk 8.3 programs are installed in /usr/local/bin. Then
+the system administrator should go to the /usr/local/bin directory and run the
+commands \fIln -s wish8.3 wish\fR and \fIln -s tclsh8.3 tclsh\fR to
+properly install Tcl/Tk for use with GRASS.
+.PP
+Furthermore, if you have more than one version of Tcl/Tk installed, make sure
+that the version you want to use with GRASS is the first version found in
+your $PATH variable. GRASS searches your $PATH variable until it finds the 
+first version of \fIwish\fR.
+.SH FILES
+\fI$UNIX_BIN/grass63\fR - GRASS startup program
+.br
+\fI$GISBASE/etc/Init.sh\fR - GRASS initialization script called by
+\fIgrass63\fR
+.br
+\fI$GISBASE/etc/gis_set.tcl\fR - Tcl/Tk script to set the
+location and mapset to use. Called by \fIInit.sh\fR
+.br
+.SH SEE ALSO
+List of implemented GRASS environment variables.
+.PP
+GRASS Web site
+.SH AUTHORS (of this page)
+Justin Hickey
+.br
+Markus Neteler
+.PP
+\fILast changed: $Date: 2006-11-02 07:48:36 +0100 (Thu, 02 Nov 2006) $\fR
+.PP
+Help Index

Modified: packages/grass/branches/6.3/debian/patches/www-browser.dpatch
===================================================================
--- packages/grass/branches/6.3/debian/patches/www-browser.dpatch	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/patches/www-browser.dpatch	2008-07-10 11:09:42 UTC (rev 1712)
@@ -5,10 +5,10 @@
 ## DP: Use www-browser as HTML browser, the Debian way
 
 @DPATCH@
-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 @@
+diff -urNad grass-preview-6.3.0~/lib/init/init.sh grass-preview-6.3.0/lib/init/init.sh
+--- grass-preview-6.3.0~/lib/init/init.sh	2008-04-21 13:55:30.000000000 +0200
++++ grass-preview-6.3.0/lib/init/init.sh	2008-04-21 14:01:49.000000000 +0200
+@@ -268,67 +268,11 @@
  
  # try and find a web browser if one isn't already specified
  if [ ! "$GRASS_HTML_BROWSER" ] ; then
@@ -46,6 +46,9 @@
 -        elif [ -f "$i/mozilla-firefox" ] ; then
 -            GRASS_HTML_BROWSER=mozilla-firefox
 -            break
+-        elif [ -f "$i/firefox" ] ; then
+-            GRASS_HTML_BROWSER=firefox
+-            break
 -        elif [ -f "$i/opera" ] ; then
 -            GRASS_HTML_BROWSER=opera
 -            break
@@ -70,11 +73,11 @@
 -    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
-+	else 
-+   		GRASS_HTML_BROWSER=true
-+   	fi
++    	if [ -x /usr/bin/x-www-browser ] ; then
++    		GRASS_HTML_BROWSER=x-www-browser
++ 	else 
++    		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	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/patches/xterm.dpatch	2008-07-10 11:09:42 UTC (rev 1712)
@@ -5,98 +5,15 @@
 ## DP: No description.
 
 @DPATCH@
-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
+diff -urNad grass-preview-6.3.0~/lib/init/grass-xterm-wrapper grass-preview-6.3.0/lib/init/grass-xterm-wrapper
+--- grass-preview-6.3.0~/lib/init/grass-xterm-wrapper	2008-04-12 01:26:58.000000000 +0200
++++ grass-preview-6.3.0/lib/init/grass-xterm-wrapper	2008-04-21 14:09:45.000000000 +0200
+@@ -3,7 +3,7 @@
  
--SYSTEM=`uname -s`
--case $SYSTEM in
--Darwin*)
--	MACOSX=1
--	;;
--esac
--
  if [ -z "$GRASS_XTERM" ] ; then
--    if [ "$MACOSX" ] ; then
--        GRASS_XTERM=Terminal.app
--    else
--        GRASS_XTERM=xterm
--    fi
-+        GRASS_XTERM=x-terminal-emulator
- fi
- 
--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 "$@"
+    # find a working xterm or xterm compatible executable
+-   TERM_TRY="xterm rxvt x-terminal-emulator"
++   TERM_TRY="x-terminal-emulator rxvt xterm"
+    for TERM_PROG in $TERM_TRY ; do
+       if [ -x "`which $TERM_PROG`" ] ; then
+          GRASS_XTERM="$TERM_PROG"

Modified: packages/grass/branches/6.3/debian/rules
===================================================================
--- packages/grass/branches/6.3/debian/rules	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/rules	2008-07-10 11:09:42 UTC (rev 1712)
@@ -9,6 +9,9 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+BASE_NAME=grass63
+PKG_NAME=grass-preview
+
 CFLAGS=-Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -22,9 +25,19 @@
 	STRIP = strip
 endif
 
+#
+# This is used to test about the use of default tcl-dev, just
+# useful for backports. To be removed after Lenny.
+#
+ifeq (0,$(shell test -d /usr/include/tcl; echo $$?))
+	TCLINC = /usr/include/tcl
+else
+	TCLINC = /usr/include/tcl8.4
+endif
+
 include /usr/share/dpatch/dpatch.make
 
-config-stamp: patch
+config-stamp: patch-stamp
 	dh_testdir
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -46,9 +59,9 @@
 		    --with-sqlite \
 		    --enable-largefile \
                     --with-freetype-includes=/usr/include/freetype2 \
-                    --with-tcltk-includes=/usr/include/tcl8.4 \
+                    --with-tcltk-includes=$(TCLINC) \
                     --with-postgres-includes=$(shell pg_config --includedir) \
-                    --with-mysql-includes=/usr/include/mysql \
+                    --with-mysql-includes=$(shell mysql_config --include|sed -e 's/-I//') \
 		    --with-proj-share=/usr/share/proj
 
 	touch config-stamp
@@ -79,7 +92,8 @@
 	dh_testroot
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f $(CURDIR)/include/Make/Platform.make ] || $(MAKE) distclean
+
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -92,7 +106,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/grass63.1
+	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 \
@@ -123,8 +137,8 @@
 
 	# install grass core into debian/tmp
 	$(MAKE) $(STRIP)
-	$(MAKE) install INST_DIR=$(CURDIR)/debian/tmp/usr/lib/grass \
-		PREFIX=$(CURDIR)/debian/tmp/usr/lib/grass \
+	$(MAKE) install INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \
+		PREFIX=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \
 		BINDIR=$(CURDIR)/debian/tmp/usr/bin
 
 	# fix all the braindead scripts
@@ -134,21 +148,21 @@
 	debian/fixpaths.sh $(CURDIR)/debian/tmp debian/tmp
 	
 	# delete extra license files
-	rm -f debian/tmp/usr/lib/grass/bwidget/LICENSE.txt
+	rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LICENSE.txt
     
 	# change section from 1 to .1grass 
-	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
+	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 n=`basename $$m .1`; mv $$m debian/tmp/usr/lib/$(BASE_NAME)/man/man1/$$n.1grass; done
+	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	
-	install -m 644 include/Make/Module.make debian/grass-dev/usr/lib/grass/include/Make/Module.make
+	install -m 644 include/Make/Module.make debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/include/Make/Module.make
 
 	# install pkg-config file
-	install -m 644 grass.pc debian/grass-dev/usr/share/pkgconfig/grass.pc
+	install -m 644 grass.pc debian/$(PKG_NAME)-dev/usr/share/pkgconfig/$(BASE_NAME).pc
 
 	# install ld.so file
-	install -m 644 debian/grass.conf debian/grass/etc/ld.so.conf.d/grass.conf
+	install -m 644 debian/grass.conf debian/$(PKG_NAME)/etc/ld.so.conf.d/$(BASE_NAME).conf
 
 install-indep: build-indep
 	dh_testdir -i
@@ -169,7 +183,7 @@
 	dh_installchangelogs -i CHANGES
 	dh_installdocs -i
 	dh_install --sourcedir=debian/tmp -i
-	dh_link -i
+#	dh_link -i
 	dh_strip -i
 	dh_compress -i
 	dh_fixperms -i
@@ -186,17 +200,17 @@
 	dh_installdocs  -a
 	dh_installexamples  -a
 	dh_install --sourcedir=debian/tmp -a
-	dh_installman -pgrass debian/grass63.1 -a
-	dh_link -a
+	dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a
+#	dh_link -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -a -a
 	dh_installdeb -a
-	dh_shlibdeps -a
+	dh_shlibdeps -a -l$(CURDIR)/debian/$(PKG_NAME)/usr/lib/$(BASE_NAME)/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch

Modified: packages/grass/branches/6.3/debian/watch
===================================================================
--- packages/grass/branches/6.3/debian/watch	2008-07-10 09:06:13 UTC (rev 1711)
+++ packages/grass/branches/6.3/debian/watch	2008-07-10 11:09:42 UTC (rev 1712)
@@ -1,2 +1,2 @@
 version=2
-http://grass.itc.it/grass62/source/grass-([\d\.]*).tar.gz debian uupdate
+http://grass.itc.it/grass63/source/grass-([\d\.]*).tar.gz debian uupdate




More information about the Pkg-grass-devel mailing list