[DebianGIS-dev] r549 - in packages/grass/branches/6.1/debian: .
patches
Francesco Lovergine
frankie at costa.debian.org
Fri Aug 25 12:54:11 UTC 2006
Author: frankie
Date: 2006-08-25 12:54:09 +0000 (Fri, 25 Aug 2006)
New Revision: 549
Removed:
packages/grass/branches/6.1/debian/patches/epsg-codes-loc.dpatch
packages/grass/branches/6.1/debian/patches/fftw3.dpatch
packages/grass/branches/6.1/debian/patches/nviz.dpatch
Modified:
packages/grass/branches/6.1/debian/changelog
packages/grass/branches/6.1/debian/grass-doc.install
packages/grass/branches/6.1/debian/grass.install
packages/grass/branches/6.1/debian/grass.links
packages/grass/branches/6.1/debian/patches/00list
packages/grass/branches/6.1/debian/patches/htmlgen-fakeroot.dpatch
packages/grass/branches/6.1/debian/patches/xterm-fix.dpatch
packages/grass/branches/6.1/debian/rules
packages/grass/branches/6.1/debian/watch
Log:
First import for 6.1 branch
Modified: packages/grass/branches/6.1/debian/changelog
===================================================================
--- packages/grass/branches/6.1/debian/changelog 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/changelog 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,3 +1,14 @@
+grass (6.1.0-1) UNRELEASED; urgency=low
+
+ * Starting development tree for 6.1 version.
+ * Removed patches merged upstream: nviz and fftw3.
+ * Revised patches:
+ htmlgen-fakeroot.dpatch
+ xterm-fix.dpatch
+ * Merged changes from 6.0.2-[4..6] branch.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 22 Aug 2006 00:10:11 +0200
+
grass (6.0.2-4) unstable; urgency=low
* Moved to libgdal1-1.3.2-dev build-dep, now available.
Modified: packages/grass/branches/6.1/debian/grass-doc.install
===================================================================
--- packages/grass/branches/6.1/debian/grass-doc.install 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/grass-doc.install 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,6 +1,5 @@
usr/lib/grass/docs/html usr/share/doc/grass-doc
usr/lib/grass/man/man1 usr/share/man
-usr/lib/grass/docs/nviz usr/share/doc/grass-doc
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
Modified: packages/grass/branches/6.1/debian/grass.install
===================================================================
--- packages/grass/branches/6.1/debian/grass.install 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/grass.install 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,4 +1,4 @@
-usr/bin/grass60
+usr/bin/grass61
usr/lib/grass/bin
usr/lib/grass/bwidget
usr/lib/grass/driver
Modified: packages/grass/branches/6.1/debian/grass.links
===================================================================
--- packages/grass/branches/6.1/debian/grass.links 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/grass.links 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,2 +1,2 @@
-usr/bin/grass60 usr/bin/grass
-usr/share/man/man1/grass60.1.gz usr/share/man/man1/grass.1.gz
+usr/bin/grass61 usr/bin/grass
+usr/share/man/man1/grass61.1.gz usr/share/man/man1/grass.1.gz
Modified: packages/grass/branches/6.1/debian/patches/00list
===================================================================
--- packages/grass/branches/6.1/debian/patches/00list 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/patches/00list 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,5 +1,2 @@
-epsg-codes-loc
htmlgen-fakeroot
xterm-fix
-fftw3
-nviz
Deleted: packages/grass/branches/6.1/debian/patches/epsg-codes-loc.dpatch
===================================================================
--- packages/grass/branches/6.1/debian/patches/epsg-codes-loc.dpatch 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/patches/epsg-codes-loc.dpatch 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## epsg-codes-loc.dpatch by <debian at adkgis.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad grass-5.7.0+6.0.0beta1/lib/init/epsg_option.tcl /tmp/dpep.Ly5J8O/grass-5.7.0+6.0.0beta1/lib/init/epsg_option.tcl
---- grass-5.7.0+6.0.0beta1/lib/init/epsg_option.tcl 2005-01-12 09:01:55.000000000 -0500
-+++ /tmp/dpep.Ly5J8O/grass-5.7.0+6.0.0beta1/lib/init/epsg_option.tcl 2005-01-19 11:06:33.000000000 -0500
-@@ -58,7 +58,7 @@
- global thelocation
- global browsedepsg
-
-- set browsedepsg "/usr/local/share/proj/epsg"
-+ set browsedepsg "/usr/share/proj/epsg"
- set epsgLocation "newLocation"
- set epsg_code ""
-
-@@ -91,7 +91,7 @@
-
- bind .optPopup.input3_ppbEntry <Leave> {
- if {$browsedepsg == ""} {
-- set browsedepsg "/usr/local/share/proj/epsg"
-+ set browsedepsg "/usr/share/proj/epsg"
- }
- }
-
-@@ -270,7 +270,7 @@
- .infoPopup.text insert end "\nThe Grass database in which the location should be created\n\n"
- .infoPopup.text insert end "\n"
- .infoPopup.text insert end "\n EPSG code number of projection:\n\n" subtitle
-- .infoPopup.text insert end "\nEPSG code number of projection (see /usr/local/share/proj/epsg or push the 'EPSG-codes' button)\n\n"
-+ .infoPopup.text insert end "\nEPSG code number of projection (see /usr/share/proj/epsg or push the 'EPSG-codes' button)\n\n"
-
- pack .infoPopup.text -side left -fill both
-
Deleted: packages/grass/branches/6.1/debian/patches/fftw3.dpatch
===================================================================
--- packages/grass/branches/6.1/debian/patches/fftw3.dpatch 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/patches/fftw3.dpatch 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,1094 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fftw3.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad grass-6.0.2~/configure grass-6.0.2/configure
---- grass-6.0.2~/configure 2006-03-24 15:13:42.000000000 +0100
-+++ grass-6.0.2/configure 2006-03-27 23:50:48.000000000 +0200
-@@ -10239,7 +10239,7 @@
-
- ac_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$FFTWINC $CPPFLAGS"
--for ac_hdr in fftw.h
-+for ac_hdr in fftw3.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -10274,8 +10274,8 @@
- else
- echo "$ac_t""no" 1>&6
- ac_save_cppflags="$CPPFLAGS"
--CPPFLAGS=" $CPPFLAGS"
--for ac_hdr in dfftw.h
-+CPPFLAGS="$FFTWINC $CPPFLAGS"
-+for ac_hdr in fftw.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -10309,6 +10309,42 @@
-
- else
- echo "$ac_t""no" 1>&6
-+ac_save_cppflags="$CPPFLAGS"
-+CPPFLAGS=" $CPPFLAGS"
-+for ac_hdr in dfftw.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:10319: checking for $ac_hdr" >&5
-+
-+cat > conftest.$ac_ext <<EOF
-+#line 10322 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:10327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ rm -rf conftest*
-+ eval "ac_cv_header_$ac_safe=yes"
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
- { echo "configure: error: *** Unable to locate FFTW includes." 1>&2; exit 1; }
-
- fi
-@@ -10323,11 +10359,17 @@
- CPPFLAGS=$ac_save_cppflags
-
-
-+fi
-+done
-+
-+CPPFLAGS=$ac_save_cppflags
-+
-+
- # With FFTW library directory
-
-
- echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
--echo "configure:10331: checking for location of FFTW library" >&5
-+echo "configure:10373: checking for location of FFTW library" >&5
- case "$with_fftw_libs" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-fftw-libs." 1>&2; exit 1; }
-@@ -10351,14 +10393,56 @@
- LDFLAGS="$FFTWLIB $LDFLAGS"
-
-
-+echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-+echo "configure:10398: checking for fftw_execute in -lfftw3" >&5
-+ac_lib_var=`echo fftw3'_'fftw_execute | sed 'y%./+-%__p_%'`
-+
-+ac_save_LIBS="$LIBS"
-+LIBS="-lfftw3 $MATHLIB $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 10404 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char fftw_execute();
-+
-+int main() {
-+fftw_execute()
-+; return 0; }
-+EOF
-+if { (eval echo configure:10415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ FFTWLIB="$FFTWLIB -lfftw3 $MATHLIB"
-+else
-+ echo "$ac_t""no" 1>&6
-+
-+LDFLAGS=${ac_save_ldflags}
-+
-+ac_save_ldflags="$LDFLAGS"
-+LDFLAGS="$FFTWLIB $LDFLAGS"
-+
-+
- echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
--echo "configure:10356: checking for fftwnd_one in -lfftw" >&5
-+echo "configure:10440: checking for fftwnd_one in -lfftw" >&5
- ac_lib_var=`echo fftw'_'fftwnd_one | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lfftw $MATHLIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10362 "configure"
-+#line 10446 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -10369,7 +10453,7 @@
- fftwnd_one()
- ; return 0; }
- EOF
--if { (eval echo configure:10373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -10394,13 +10478,13 @@
-
-
- echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
--echo "configure:10398: checking for fftwnd_one in -ldfftw" >&5
-+echo "configure:10482: checking for fftwnd_one in -ldfftw" >&5
- ac_lib_var=`echo dfftw'_'fftwnd_one | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-ldfftw $MATHLIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10404 "configure"
-+#line 10488 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -10411,7 +10495,7 @@
- fftwnd_one()
- ; return 0; }
- EOF
--if { (eval echo configure:10415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -10449,6 +10533,14 @@
- LDFLAGS=${ac_save_ldflags}
-
-
-+
-+fi
-+
-+
-+
-+LDFLAGS=${ac_save_ldflags}
-+
-+
- fi # $USE_FFTW
-
-
-@@ -10460,7 +10552,7 @@
-
-
- echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
--echo "configure:10464: checking whether to use BLAS" >&5
-+echo "configure:10556: checking whether to use BLAS" >&5
- echo "$ac_t"""$with_blas"" 1>&6
- case "$with_blas" in
- "no") USE_BLAS= ;;
-@@ -10482,7 +10574,7 @@
-
-
- echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
--echo "configure:10486: checking for location of BLAS library" >&5
-+echo "configure:10578: checking for location of BLAS library" >&5
- case "$with_blas_libs" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-blas-libs." 1>&2; exit 1; }
-@@ -10509,13 +10601,13 @@
-
-
- echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
--echo "configure:10513: checking for dnrm2_ in -lblas" >&5
-+echo "configure:10605: checking for dnrm2_ in -lblas" >&5
- ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lblas $MATHLIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10519 "configure"
-+#line 10611 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -10526,7 +10618,7 @@
- dnrm2_()
- ; return 0; }
- EOF
--if { (eval echo configure:10530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -10545,13 +10637,13 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
--echo "configure:10549: checking for dnrm2_ in -lblas" >&5
-+echo "configure:10641: checking for dnrm2_ in -lblas" >&5
- ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lblas $MATHLIB -lg2c $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10555 "configure"
-+#line 10647 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -10562,7 +10654,7 @@
- dnrm2_()
- ; return 0; }
- EOF
--if { (eval echo configure:10566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -10615,7 +10707,7 @@
-
-
- echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
--echo "configure:10619: checking whether to use LAPACK" >&5
-+echo "configure:10711: checking whether to use LAPACK" >&5
- echo "$ac_t"""$with_lapack"" 1>&6
- case "$with_lapack" in
- "no") USE_LAPACK= ;;
-@@ -10637,7 +10729,7 @@
-
-
- echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
--echo "configure:10641: checking for location of LAPACK library" >&5
-+echo "configure:10733: checking for location of LAPACK library" >&5
- case "$with_lapack_libs" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-lapack-libs." 1>&2; exit 1; }
-@@ -10664,13 +10756,13 @@
-
-
- echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
--echo "configure:10668: checking for dgesv_ in -llapack" >&5
-+echo "configure:10760: checking for dgesv_ in -llapack" >&5
- ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-llapack $BLASLIB $MATHLIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10674 "configure"
-+#line 10766 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -10681,7 +10773,7 @@
- dgesv_()
- ; return 0; }
- EOF
--if { (eval echo configure:10685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -10700,13 +10792,13 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
--echo "configure:10704: checking for dgesv_ in -llapack" >&5
-+echo "configure:10796: checking for dgesv_ in -llapack" >&5
- ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-llapack $BLASLIB $MATHLIB -lg2c $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10710 "configure"
-+#line 10802 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -10717,7 +10809,7 @@
- dgesv_()
- ; return 0; }
- EOF
--if { (eval echo configure:10721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -10770,7 +10862,7 @@
-
-
- echo $ac_n "checking whether to use Motif""... $ac_c" 1>&6
--echo "configure:10774: checking whether to use Motif" >&5
-+echo "configure:10866: checking whether to use Motif" >&5
- echo "$ac_t"""$with_motif"" 1>&6
- case "$with_motif" in
- "no") USE_MOTIF= ;;
-@@ -10789,7 +10881,7 @@
-
-
- echo $ac_n "checking for location of Motif includes""... $ac_c" 1>&6
--echo "configure:10793: checking for location of Motif includes" >&5
-+echo "configure:10885: checking for location of Motif includes" >&5
- case "$with_motif_includes" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-motif-includes." 1>&2; exit 1; }
-@@ -10815,15 +10907,15 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:10819: checking for $ac_hdr" >&5
-+echo "configure:10911: checking for $ac_hdr" >&5
-
- cat > conftest.$ac_ext <<EOF
--#line 10822 "configure"
-+#line 10914 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:10827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:10919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -10857,7 +10949,7 @@
-
-
- echo $ac_n "checking for location of Motif library""... $ac_c" 1>&6
--echo "configure:10861: checking for location of Motif library" >&5
-+echo "configure:10953: checking for location of Motif library" >&5
- case "$with_motif_libs" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-motif-libs." 1>&2; exit 1; }
-@@ -10882,13 +10974,13 @@
-
-
- echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
--echo "configure:10886: checking for XmStringCreate in -lXm" >&5
-+echo "configure:10978: checking for XmStringCreate in -lXm" >&5
- ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lXm $X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10892 "configure"
-+#line 10984 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -10899,7 +10991,7 @@
- XmStringCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:10903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -10940,7 +11032,7 @@
-
-
- echo $ac_n "checking whether to use GLw""... $ac_c" 1>&6
--echo "configure:10944: checking whether to use GLw" >&5
-+echo "configure:11036: checking whether to use GLw" >&5
- echo "$ac_t"""$with_glw"" 1>&6
- case "$with_glw" in
- "no") USE_GLW= ;;
-@@ -10959,7 +11051,7 @@
-
-
- echo $ac_n "checking for location of GLw includes""... $ac_c" 1>&6
--echo "configure:10963: checking for location of GLw includes" >&5
-+echo "configure:11055: checking for location of GLw includes" >&5
- case "$with_glw_includes" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-glw-includes." 1>&2; exit 1; }
-@@ -10985,15 +11077,15 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:10989: checking for $ac_hdr" >&5
-+echo "configure:11081: checking for $ac_hdr" >&5
-
- cat > conftest.$ac_ext <<EOF
--#line 10992 "configure"
-+#line 11084 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:10997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:11089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -11021,15 +11113,15 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:11025: checking for $ac_hdr" >&5
-+echo "configure:11117: checking for $ac_hdr" >&5
-
- cat > conftest.$ac_ext <<EOF
--#line 11028 "configure"
-+#line 11120 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:11033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:11125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -11069,7 +11161,7 @@
-
-
- echo $ac_n "checking for location of GLw library""... $ac_c" 1>&6
--echo "configure:11073: checking for location of GLw library" >&5
-+echo "configure:11165: checking for location of GLw library" >&5
- case "$with_glw_libs" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-glw-libs." 1>&2; exit 1; }
-@@ -11094,13 +11186,13 @@
-
-
- echo $ac_n "checking for GLwCreateMDrawingArea in -lGLw""... $ac_c" 1>&6
--echo "configure:11098: checking for GLwCreateMDrawingArea in -lGLw" >&5
-+echo "configure:11190: checking for GLwCreateMDrawingArea in -lGLw" >&5
- ac_lib_var=`echo GLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11104 "configure"
-+#line 11196 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11111,7 +11203,7 @@
- GLwCreateMDrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11136,13 +11228,13 @@
-
-
- echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLw""... $ac_c" 1>&6
--echo "configure:11140: checking for GLwCreateM1DrawingArea in -lGLw" >&5
-+echo "configure:11232: checking for GLwCreateM1DrawingArea in -lGLw" >&5
- ac_lib_var=`echo GLw'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11146 "configure"
-+#line 11238 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11153,7 +11245,7 @@
- GLwCreateM1DrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11178,13 +11270,13 @@
-
-
- echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLw""... $ac_c" 1>&6
--echo "configure:11182: checking for GLwCreateM2DrawingArea in -lGLw" >&5
-+echo "configure:11274: checking for GLwCreateM2DrawingArea in -lGLw" >&5
- ac_lib_var=`echo GLw'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11188 "configure"
-+#line 11280 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11195,7 +11287,7 @@
- GLwCreateM2DrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11220,13 +11312,13 @@
-
-
- echo $ac_n "checking for GLwCreateMDrawingArea in -lGLwM""... $ac_c" 1>&6
--echo "configure:11224: checking for GLwCreateMDrawingArea in -lGLwM" >&5
-+echo "configure:11316: checking for GLwCreateMDrawingArea in -lGLwM" >&5
- ac_lib_var=`echo GLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11230 "configure"
-+#line 11322 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11237,7 +11329,7 @@
- GLwCreateMDrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11262,13 +11354,13 @@
-
-
- echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLwM""... $ac_c" 1>&6
--echo "configure:11266: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
-+echo "configure:11358: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
- ac_lib_var=`echo GLwM'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11272 "configure"
-+#line 11364 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11279,7 +11371,7 @@
- GLwCreateM1DrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11304,13 +11396,13 @@
-
-
- echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLwM""... $ac_c" 1>&6
--echo "configure:11308: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
-+echo "configure:11400: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
- ac_lib_var=`echo GLwM'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11314 "configure"
-+#line 11406 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11321,7 +11413,7 @@
- GLwCreateM2DrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11348,13 +11440,13 @@
-
-
- echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
--echo "configure:11352: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
-+echo "configure:11444: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
- ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11358 "configure"
-+#line 11450 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11365,7 +11457,7 @@
- GLwCreateMDrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11384,13 +11476,13 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
--echo "configure:11388: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
-+echo "configure:11480: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
- ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OPENGLULIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11394 "configure"
-+#line 11486 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11401,7 +11493,7 @@
- GLwCreateMDrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11428,13 +11520,13 @@
-
-
- echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
--echo "configure:11432: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
-+echo "configure:11524: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
- ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11438 "configure"
-+#line 11530 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11445,7 +11537,7 @@
- GLwCreateMDrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11464,13 +11556,13 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
--echo "configure:11468: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
-+echo "configure:11560: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
- ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OPENGLULIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11474 "configure"
-+#line 11566 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11481,7 +11573,7 @@
- GLwCreateMDrawingArea()
- ; return 0; }
- EOF
--if { (eval echo configure:11485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11594,7 +11686,7 @@
-
-
- echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
--echo "configure:11598: checking whether to use FreeType" >&5
-+echo "configure:11690: checking whether to use FreeType" >&5
- echo "$ac_t"""$with_freetype"" 1>&6
- case "$with_freetype" in
- "no") USE_FREETYPE= ;;
-@@ -11613,7 +11705,7 @@
-
-
- echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
--echo "configure:11617: checking for location of FreeType includes" >&5
-+echo "configure:11709: checking for location of FreeType includes" >&5
- case "$with_freetype_includes" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-freetype-includes." 1>&2; exit 1; }
-@@ -11639,15 +11731,15 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:11643: checking for $ac_hdr" >&5
-+echo "configure:11735: checking for $ac_hdr" >&5
-
- cat > conftest.$ac_ext <<EOF
--#line 11646 "configure"
-+#line 11738 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:11651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:11743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -11681,7 +11773,7 @@
-
-
- echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
--echo "configure:11685: checking for location of FreeType library" >&5
-+echo "configure:11777: checking for location of FreeType library" >&5
- case "$with_freetype_libs" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-freetype-libs." 1>&2; exit 1; }
-@@ -11706,13 +11798,13 @@
-
-
- echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
--echo "configure:11710: checking for FT_Init_FreeType in -lfreetype" >&5
-+echo "configure:11802: checking for FT_Init_FreeType in -lfreetype" >&5
- ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lfreetype $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11716 "configure"
-+#line 11808 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11723,7 +11815,7 @@
- FT_Init_FreeType()
- ; return 0; }
- EOF
--if { (eval echo configure:11727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11764,7 +11856,7 @@
-
-
- echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
--echo "configure:11768: checking whether to use NLS" >&5
-+echo "configure:11860: checking whether to use NLS" >&5
- echo "$ac_t"""$with_nls"" 1>&6
- case "$with_nls" in
- "no") USE_NLS= ;;
-@@ -11784,10 +11876,10 @@
-
-
- echo $ac_n "checking for gettext""... $ac_c" 1>&6
--echo "configure:11788: checking for gettext" >&5
-+echo "configure:11880: checking for gettext" >&5
-
- cat > conftest.$ac_ext <<EOF
--#line 11791 "configure"
-+#line 11883 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gettext(); below. */
-@@ -11810,7 +11902,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:11814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_gettext=yes"
- else
-@@ -11828,13 +11920,13 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
--echo "configure:11832: checking for gettext in -lintl" >&5
-+echo "configure:11924: checking for gettext in -lintl" >&5
- ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
-
- ac_save_LIBS="$LIBS"
- LIBS="-lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 11838 "configure"
-+#line 11930 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11845,7 +11937,7 @@
- gettext()
- ; return 0; }
- EOF
--if { (eval echo configure:11849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -11880,7 +11972,7 @@
-
-
- echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
--echo "configure:11884: checking whether to use C++" >&5
-+echo "configure:11976: checking whether to use C++" >&5
- echo "$ac_t"""$with_cxx"" 1>&6
- case "$with_cxx" in
- "no") USE_CXX= ;;
-@@ -11896,7 +11988,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:11900: checking for $ac_word" >&5
-+echo "configure:11992: checking for $ac_word" >&5
-
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -11925,7 +12017,7 @@
-
-
- echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:11929: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+echo "configure:12021: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-
- ac_ext=C
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -11936,12 +12028,12 @@
-
- cat > conftest.$ac_ext << EOF
-
--#line 11940 "configure"
-+#line 12032 "configure"
- #include "confdefs.h"
-
- int main(){return(0);}
- EOF
--if { (eval echo configure:11945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:12037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cxx_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
-@@ -11967,19 +12059,19 @@
- { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:11971: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:12063: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
- cross_compiling=$ac_cv_prog_cxx_cross
-
- echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
--echo "configure:11976: checking whether we are using GNU C++" >&5
-+echo "configure:12068: checking whether we are using GNU C++" >&5
-
- cat > conftest.C <<EOF
- #ifdef __GNUC__
- yes;
- #endif
- EOF
--if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:11983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:12075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gxx=yes
- else
- ac_cv_prog_gxx=no
-@@ -11997,7 +12089,7 @@
- ac_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS=
- echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
--echo "configure:12001: checking whether ${CXX-g++} accepts -g" >&5
-+echo "configure:12093: checking whether ${CXX-g++} accepts -g" >&5
-
- echo 'void f(){}' > conftest.cc
- if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-@@ -12038,7 +12130,7 @@
-
-
- echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
--echo "configure:12042: checking whether to use openDWG" >&5
-+echo "configure:12134: checking whether to use openDWG" >&5
- echo "$ac_t"""$with_opendwg"" 1>&6
- case "$with_opendwg" in
- "no") USE_OPENDWG= ;;
-@@ -12058,7 +12150,7 @@
-
-
- echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
--echo "configure:12062: checking for location of openDGW includes" >&5
-+echo "configure:12154: checking for location of openDGW includes" >&5
- case "$with_opendwg_includes" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-opendwg-includes." 1>&2; exit 1; }
-@@ -12084,15 +12176,15 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:12088: checking for $ac_hdr" >&5
-+echo "configure:12180: checking for $ac_hdr" >&5
-
- cat > conftest.$ac_ext <<EOF
--#line 12091 "configure"
-+#line 12183 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:12096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:12188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -12126,7 +12218,7 @@
-
-
- echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
--echo "configure:12130: checking for location of openDWG library" >&5
-+echo "configure:12222: checking for location of openDWG library" >&5
- case "$with_opendwg_libs" in
- y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-opendwg-libs." 1>&2; exit 1; }
-diff -urNad grass-6.0.2~/configure.in grass-6.0.2/configure.in
---- grass-6.0.2~/configure.in 2006-03-24 15:13:42.000000000 +0100
-+++ grass-6.0.2/configure.in 2006-03-27 23:48:18.000000000 +0200
-@@ -933,17 +933,21 @@
-
- LOC_CHECK_INC_PATH(fftw,FFTW,FFTWINC)
-
-+LOC_CHECK_INCLUDES(fftw3.h,FFTW,$FFTWINC,[
- LOC_CHECK_INCLUDES(fftw.h,FFTW,$FFTWINC,[
- LOC_CHECK_INCLUDES(dfftw.h,FFTW,,)
- ])
-+])
-
- # With FFTW library directory
-
- LOC_CHECK_LIB_PATH(fftw,FFTW,FFTWLIB)
-
-+LOC_CHECK_LIBS(fftw3,fftw_execute,FFTW,$FFTWLIB,FFTWLIB,,$MATHLIB,[
- LOC_CHECK_LIBS(fftw, fftwnd_one,FFTW,$FFTWLIB,FFTWLIB,,$MATHLIB,[
- LOC_CHECK_LIBS(dfftw,fftwnd_one,FFTW,$FFTWLIB,FFTWLIB,,$MATHLIB,)
- ])
-+])
-
- fi # $USE_FFTW
-
-diff -urNad grass-6.0.2~/include/config.h.in grass-6.0.2/include/config.h.in
---- grass-6.0.2~/include/config.h.in 2005-08-01 12:16:26.000000000 +0200
-+++ grass-6.0.2/include/config.h.in 2006-03-27 23:49:12.000000000 +0200
-@@ -137,6 +137,9 @@
- /* define if jpeglib.h exists */
- #undef HAVE_JPEGLIB_H
-
-+/* define if fftw3.h exists */
-+#undef HAVE_FFTW3_H
-+
- /* define if fftw.h exists */
- #undef HAVE_FFTW_H
-
-diff -urNad grass-6.0.2~/lib/gmath/del2g.c grass-6.0.2/lib/gmath/del2g.c
---- grass-6.0.2~/lib/gmath/del2g.c 2003-10-06 12:13:29.000000000 +0200
-+++ grass-6.0.2/lib/gmath/del2g.c 2006-03-27 23:48:18.000000000 +0200
-@@ -16,7 +16,7 @@
- */
- #include "config.h"
-
--#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H)
-+#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
-
- #include <stdio.h>
- #include "gmath.h"
-diff -urNad grass-6.0.2~/lib/gmath/fft.c grass-6.0.2/lib/gmath/fft.c
---- grass-6.0.2~/lib/gmath/fft.c 2004-11-09 13:24:13.000000000 +0100
-+++ grass-6.0.2/lib/gmath/fft.c 2006-03-27 23:48:18.000000000 +0200
-@@ -2,15 +2,22 @@
-
- #include "config.h"
-
--#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H)
-+#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
-
- #ifdef HAVE_FFTW_H
- #include <fftw.h>
- #endif
-+
- #ifdef HAVE_DFFTW_H
- #include <dfftw.h>
- #endif
-
-+#ifdef HAVE_FFTW3_H
-+#include <fftw3.h>
-+#define c_re(c) ((c)[0])
-+#define c_im(c) ((c)[1])
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-@@ -37,7 +44,11 @@
-
- int fft(int i_sign, double *DATA[2], int NN, int dimc, int dimr)
- {
-+#ifdef HAVE_FFTW3_H
-+ fftw_plan plan;
-+#else
- fftwnd_plan plan;
-+#endif
- fftw_complex *data;
- double norm;
- int i;
-@@ -48,9 +59,17 @@
-
- for (i = 0; i < NN; i++)
- {
-- data[i].re = DATA[0][i];
-- data[i].im = DATA[1][i];
-- }
-+ c_re(data[i]) = DATA[0][i];
-+ c_im(data[i]) = DATA[1][i];
-+ }
-+
-+#ifdef HAVE_FFTW3_H
-+ plan = fftw_plan_dft_2d(dimc, dimr, data, data,(i_sign < 0) ? FFTW_FORWARD : FFTW_BACKWARD, FFTW_ESTIMATE);
-+
-+ fftw_execute(plan);
-+
-+ fftw_destroy_plan(plan);
-+ #else
-
- plan = fftw2d_create_plan(
- dimc, dimr,
-@@ -61,10 +80,12 @@
-
- fftwnd_destroy_plan(plan);
-
-+#endif
-+
- for (i = 0; i < NN; i++)
- {
-- DATA[0][i] = data[i].re * norm;
-- DATA[1][i] = data[i].im * norm;
-+ DATA[0][i] = c_re(data[i]) * norm;
-+ DATA[1][i] = c_im(data[i]) * norm;
- }
-
- G_free(data);
Modified: packages/grass/branches/6.1/debian/patches/htmlgen-fakeroot.dpatch
===================================================================
--- packages/grass/branches/6.1/debian/patches/htmlgen-fakeroot.dpatch 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/patches/htmlgen-fakeroot.dpatch 2006-08-25 12:54:09 UTC (rev 549)
@@ -7,15 +7,15 @@
## DP: pages from being built.
@DPATCH@
-diff -urNad grass-5.7.0+6.0.0beta2/include/Make/Rules.make /tmp/dpep.bOaT9i/grass-5.7.0+6.0.0beta2/include/Make/Rules.make
---- grass-5.7.0+6.0.0beta2/include/Make/Rules.make 2004-12-17 05:57:28.000000000 -0500
-+++ /tmp/dpep.bOaT9i/grass-5.7.0+6.0.0beta2/include/Make/Rules.make 2005-03-01 12:48:12.000000000 -0500
-@@ -53,7 +53,7 @@
+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
+@@ -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>' > $(PGM).tmp.html ; true
-+ fakeroot $(1) --html-description | grep -v '</body>' > $(PGM).tmp.html ; true
+- $(1) --html-description | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true
++ 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.1/debian/patches/nviz.dpatch
===================================================================
--- packages/grass/branches/6.1/debian/patches/nviz.dpatch 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/patches/nviz.dpatch 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,211 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## nviz.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad grass-6.0.2~/visualization/nviz/src/exag.c grass-6.0.2/visualization/nviz/src/exag.c
---- grass-6.0.2~/visualization/nviz/src/exag.c 2004-11-09 15:20:10.000000000 +0100
-+++ grass-6.0.2/visualization/nviz/src/exag.c 2006-03-24 14:01:34.000000000 +0100
-@@ -130,7 +130,7 @@
- list[2] = max;
- list[3] = NULL;
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return TCL_OK;
-
-diff -urNad grass-6.0.2~/visualization/nviz/src/lights.c grass-6.0.2/visualization/nviz/src/lights.c
---- grass-6.0.2~/visualization/nviz/src/lights.c 2004-11-09 15:20:29.000000000 +0100
-+++ grass-6.0.2/visualization/nviz/src/lights.c 2006-03-24 14:02:23.000000000 +0100
-@@ -121,7 +121,7 @@
- list[3] = NULL;
-
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
- return (TCL_OK);
- }
-
-@@ -142,7 +142,7 @@
- list[3] = NULL;
-
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
- return (TCL_OK);
- }
-
-@@ -166,7 +166,7 @@
- list[4] = NULL;
-
- interp->result = Tcl_Merge(4, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
- return (TCL_OK);
- }
-
-diff -urNad grass-6.0.2~/visualization/nviz/src/map_obj.c grass-6.0.2/visualization/nviz/src/map_obj.c
---- grass-6.0.2~/visualization/nviz/src/map_obj.c 2006-01-03 09:38:16.000000000 +0100
-+++ grass-6.0.2/visualization/nviz/src/map_obj.c 2006-03-24 14:03:01.000000000 +0100
-@@ -874,7 +874,7 @@
- list[3] = NULL;
-
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
- return (TCL_OK);
-
- }
-@@ -997,7 +997,7 @@
- }
-
- interp->result = Tcl_Merge(n, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
-@@ -1161,7 +1161,7 @@
- list[3] = NULL;
-
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
-diff -urNad grass-6.0.2~/visualization/nviz/src/position.c grass-6.0.2/visualization/nviz/src/position.c
---- grass-6.0.2~/visualization/nviz/src/position.c 2005-08-01 12:16:43.000000000 +0200
-+++ grass-6.0.2/visualization/nviz/src/position.c 2006-03-24 14:00:01.000000000 +0100
-@@ -36,7 +36,7 @@
-
-
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
- return (TCL_OK);
- }
-
-@@ -61,7 +61,7 @@
-
-
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
-
- return (TCL_OK);
-@@ -443,7 +443,7 @@
- list[0] = fov_name;
- list[1] = NULL;
- interp->result = Tcl_Merge(1, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
-
- return (TCL_OK);
-@@ -482,7 +482,7 @@
- list[0] = twist_name;
- list[1] = NULL;
- interp->result = Tcl_Merge(1, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
-@@ -509,7 +509,7 @@
- list[4] = NULL;
-
- interp->result = Tcl_Merge(4, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
-@@ -537,7 +537,7 @@
- if (!GS_get_selected_point_on_surface(sx, sy, &id, &x, &y, &z)) {
- list[0] = NULL;
- interp->result = Tcl_Merge(0, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
-@@ -554,7 +554,7 @@
- list[4] = NULL;
-
- interp->result = Tcl_Merge(4, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
-
-@@ -586,7 +586,7 @@
- if (!GS_get_selected_point_on_surface(sx, sy, &id, &x, &y, &z)) {
- list[0] = NULL;
- interp->result = Tcl_Merge(0, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
-@@ -604,7 +604,7 @@
- list[5] = NULL;
-
- interp->result = Tcl_Merge(5, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
-
-@@ -776,7 +776,7 @@
-
-
- interp->result = Tcl_Merge(2, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
- return (TCL_OK);
- }
-
-@@ -819,7 +819,7 @@
- list[3] = NULL;
-
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
-diff -urNad grass-6.0.2~/visualization/nviz/src/volume.c grass-6.0.2/visualization/nviz/src/volume.c
---- grass-6.0.2~/visualization/nviz/src/volume.c 2006-01-03 09:38:16.000000000 +0100
-+++ grass-6.0.2/visualization/nviz/src/volume.c 2006-03-24 14:02:40.000000000 +0100
-@@ -51,7 +51,7 @@
- list[3] = NULL;
-
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
-@@ -451,7 +451,7 @@
- list[3] = NULL;
-
- interp->result = Tcl_Merge(3, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
-@@ -571,7 +571,7 @@
- list[7] = NULL;
-
- interp->result = Tcl_Merge(7, list);
-- interp->freeProc = (Tcl_FreeProc *) free;
-+ interp->freeProc = TCL_DYNAMIC;
-
- return (TCL_OK);
- }
Modified: packages/grass/branches/6.1/debian/patches/xterm-fix.dpatch
===================================================================
--- packages/grass/branches/6.1/debian/patches/xterm-fix.dpatch 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/patches/xterm-fix.dpatch 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,91 +1,254 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## xterm-fix.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+## htmlgen-fakeroot.dpatch by <debian at adkgis.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: use fakeroot to avoid weird stat/permission problem when
+## DP: building under pbuilder. This was preventing most man
+## DP: pages from being built.
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./display/d.m/d.m.tcl /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/d.m.tcl
---- ./display/d.m/d.m.tcl 2005-08-01 12:16:25.000000000 +0200
-+++ /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/d.m.tcl 2005-09-12 16:44:23.000000000 +0200
-@@ -92,7 +92,7 @@
+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 -e $env(GISBASE)/etc/grass-run.sh $cmd $args &
-+ eval exec -- x-terminal-emulator -e $env(GISBASE)/etc/grass-run.sh $cmd $args &
+- 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 --exclude=CVS --exclude=.svn ./display/d.m/script/d.colors.sh /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/script/d.colors.sh
---- ./display/d.m/script/d.colors.sh 2005-02-28 17:33:21.000000000 +0100
-+++ /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/script/d.colors.sh 2005-09-12 16:45:56.000000000 +0200
+ ###############################################################################
+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 --exclude=CVS --exclude=.svn ./display/d.m/script/r.colors.rules /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/script/r.colors.rules
---- ./display/d.m/script/r.colors.rules 2005-02-28 17:34:46.000000000 +0100
-+++ /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/script/r.colors.rules 2005-09-12 16:46:04.000000000 +0200
+-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 --exclude=CVS --exclude=.svn ./display/d.m/script/r.reclass.rules /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/script/r.reclass.rules
---- ./display/d.m/script/r.reclass.rules 2005-02-28 17:34:51.000000000 +0100
-+++ /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/script/r.reclass.rules 2005-09-12 16:45:11.000000000 +0200
+-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 --exclude=CVS --exclude=.svn ./display/d.m/script/r.recode.rules /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/script/r.recode.rules
---- ./display/d.m/script/r.recode.rules 2005-02-28 17:34:57.000000000 +0100
-+++ /tmp/dpep-work.vpKGWW/grass-6.0.1/display/d.m/script/r.recode.rules 2005-09-12 16:46:16.000000000 +0200
+-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 --exclude=CVS --exclude=.svn ./lib/init/epsg_option.tcl /tmp/dpep-work.vpKGWW/grass-6.0.1/lib/init/epsg_option.tcl
---- ./lib/init/epsg_option.tcl 2005-01-12 15:37:32.000000000 +0100
-+++ /tmp/dpep-work.vpKGWW/grass-6.0.1/lib/init/epsg_option.tcl 2005-09-12 16:42:11.000000000 +0200
-@@ -130,7 +130,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 $database >@stdout 2>@stderr;
- DialogGen .wrnDlg "WARNING: restart Grass please" warning "WARNING: \
- Please restart Grass in order find the created location in the list (closing it for you now)" \
-diff -urNad --exclude=CVS --exclude=.svn ./scripts/r3.mapcalculator/r3.mapcalculator /tmp/dpep-work.vpKGWW/grass-6.0.1/scripts/r3.mapcalculator/r3.mapcalculator
---- ./scripts/r3.mapcalculator/r3.mapcalculator 2004-11-03 08:40:36.000000000 +0100
-+++ /tmp/dpep-work.vpKGWW/grass-6.0.1/scripts/r3.mapcalculator/r3.mapcalculator 2005-09-12 16:46:46.000000000 +0200
-@@ -130,7 +130,7 @@
- # use old style mapcalc
+-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
- if [ $GIS_FLAG_e = 1 ] ; then
-- exec xterm -e r3.mapcalc &
-+ exec x-terminal-emulator -e r3.mapcalc &
- exit 0
+-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
-diff -urNad --exclude=CVS --exclude=.svn ./scripts/r.mapcalculator/r.mapcalculator /tmp/dpep-work.vpKGWW/grass-6.0.1/scripts/r.mapcalculator/r.mapcalculator
---- ./scripts/r.mapcalculator/r.mapcalculator 2004-11-03 08:40:36.000000000 +0100
-+++ /tmp/dpep-work.vpKGWW/grass-6.0.1/scripts/r.mapcalculator/r.mapcalculator 2005-09-12 16:46:34.000000000 +0200
+-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
+ 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.1/debian/rules
===================================================================
--- packages/grass/branches/6.1/debian/rules 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/rules 2006-08-25 12:54:09 UTC (rev 549)
@@ -88,12 +88,29 @@
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/grass60.1
+ rm -f debian/grass61.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
+ lib/vector/latex lib/db/latex lib/gis/latex \
+ lib/g3d/html \
+ lib/ogsf/html \
+ lib/proj/html \
+ lib/gmath/html \
+ lib/segment/html \
+ lib/vector/dglib/html \
+ rfc/html \
+ swig/html \
+ lib/g3d/latex \
+ lib/ogsf/latex \
+ lib/proj/latex \
+ lib/gmath/latex \
+ lib/segment/latex \
+ lib/vector/dglib/latex \
+ rfc/latex \
+ swig/latex
+
install: build
dh_testdir
dh_testroot
@@ -116,7 +133,7 @@
rm -f debian/tmp/usr/lib/grass/etc/license 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/grass60.1
+ mv debian/tmp/usr/lib/grass/man/man1/grass6.1 debian/grass61.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
@@ -159,7 +176,7 @@
dh_installdocs -a
dh_installexamples -a
dh_install --sourcedir=debian/tmp -a
- dh_installman -pgrass debian/grass60.1 -a
+ dh_installman -pgrass debian/grass61.1 -a
dh_link -a
dh_strip -a
dh_compress -a
Modified: packages/grass/branches/6.1/debian/watch
===================================================================
--- packages/grass/branches/6.1/debian/watch 2006-08-24 11:20:35 UTC (rev 548)
+++ packages/grass/branches/6.1/debian/watch 2006-08-25 12:54:09 UTC (rev 549)
@@ -1,2 +1,2 @@
version=2
-http://grass.itc.it/grass60/source/grass-([\d\.]*).tar.gz debian uupdate
+http://grass.itc.it/grass61/source/grass-([\d\.]*).tar.gz debian uupdate
More information about the Pkg-grass-devel
mailing list