[DebianGIS-dev] r756 - in packages/grass/trunk/debian: . patches

Francesco Lovergine frankie at alioth.debian.org
Wed Apr 11 18:06:52 UTC 2007


Author: frankie
Date: 2007-04-11 18:06:52 +0000 (Wed, 11 Apr 2007)
New Revision: 756

Modified:
   packages/grass/trunk/debian/changelog
   packages/grass/trunk/debian/compat
   packages/grass/trunk/debian/control
   packages/grass/trunk/debian/patches/00list
   packages/grass/trunk/debian/patches/htmlgen-fakeroot.dpatch
   packages/grass/trunk/debian/patches/pager.dpatch
   packages/grass/trunk/debian/patches/www-browser.dpatch
   packages/grass/trunk/debian/rules
Log:
New upstream release 6.2.2


Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog	2007-04-11 08:15:35 UTC (rev 755)
+++ packages/grass/trunk/debian/changelog	2007-04-11 18:06:52 UTC (rev 756)
@@ -1,3 +1,13 @@
+grass (6.2.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Patchset updated.
+  * Added --enable-largefiles for LFS support.
+  * Added sqlite3 support.
+  * Moved to debhelper version 5 compatibility.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri,  6 Apr 2007 19:55:22 +0200
+
 grass (6.2.1-3) unstable; urgency=low
 
   * Sigh, fixed www-browser: s/elif/else/  
@@ -9,8 +19,8 @@
   * Fixed watch and grass.links files for grass62
   * Install grass.pc file for pkg-config
   * New patches:
-  	www-browser -- Use www-browser as default browser
-  	pager -- User pager as default text pager
+       www-browser -- Use www-browser as default browser
+       pager -- User pager as default text pager
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon,  2 Apr 2007 23:42:03 +0200
 

Modified: packages/grass/trunk/debian/compat
===================================================================
--- packages/grass/trunk/debian/compat	2007-04-11 08:15:35 UTC (rev 755)
+++ packages/grass/trunk/debian/compat	2007-04-11 18:06:52 UTC (rev 756)
@@ -1 +1 @@
-4
+5

Modified: packages/grass/trunk/debian/control
===================================================================
--- packages/grass/trunk/debian/control	2007-04-11 08:15:35 UTC (rev 755)
+++ packages/grass/trunk/debian/control	2007-04-11 18:06:52 UTC (rev 756)
@@ -3,7 +3,10 @@
 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 (>= 4.0.2), dpatch, libtiff4-dev, tcl8.4-dev, tk8.4-dev, fftw3-dev, libxmu-dev, libgl1-mesa-swx11-dev, libglu1-xorg-dev | xlibmesa-glu-dev, libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>=1.4.0-1) | libgdal1-1.3.2-dev, proj (>= 4.4.7), libjpeg62-dev, libpng12-dev, libpq-dev | postgresql-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz
+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, libgl1-mesa-swx11-dev, libglu1-xorg-dev | xlibmesa-glu-dev, 
+	libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>=1.4.0-1) | libgdal1-1.3.2-dev, proj (>= 4.4.7), libjpeg62-dev, 
+	libpng12-dev, libpq-dev | postgresql-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev 
 Standards-Version: 3.7.2
 
 Package: grass

Modified: packages/grass/trunk/debian/patches/00list
===================================================================
--- packages/grass/trunk/debian/patches/00list	2007-04-11 08:15:35 UTC (rev 755)
+++ packages/grass/trunk/debian/patches/00list	2007-04-11 18:06:52 UTC (rev 756)
@@ -1,3 +1,4 @@
 htmlgen-fakeroot
 www-browser
 pager
+#r.in.wms

Modified: packages/grass/trunk/debian/patches/htmlgen-fakeroot.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/htmlgen-fakeroot.dpatch	2007-04-11 08:15:35 UTC (rev 755)
+++ packages/grass/trunk/debian/patches/htmlgen-fakeroot.dpatch	2007-04-11 18:06:52 UTC (rev 756)
@@ -7,9 +7,9 @@
 ## DP: pages from being built.
 
 @DPATCH@
-diff -urNad grass-6.2~beta1~/include/Make/Html.make grass-6.2~beta1/include/Make/Html.make
---- grass-6.2~beta1~/include/Make/Html.make	2006-08-28 22:31:15.000000000 +0200
-+++ grass-6.2~beta1/include/Make/Html.make	2006-08-28 22:35:36.000000000 +0200
+diff -urNad grass-6.2.2~/include/Make/Html.make grass-6.2.2/include/Make/Html.make
+--- grass-6.2.2~/include/Make/Html.make	2007-04-11 15:29:16.000000000 +0200
++++ grass-6.2.2/include/Make/Html.make	2007-04-11 15:30:48.000000000 +0200
 @@ -92,7 +92,7 @@
  	GISBASE=$(GISBASE) \
  	PATH=$(GISBASE)/bin:$$PATH \

Modified: packages/grass/trunk/debian/patches/pager.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/pager.dpatch	2007-04-11 08:15:35 UTC (rev 755)
+++ packages/grass/trunk/debian/patches/pager.dpatch	2007-04-11 18:06:52 UTC (rev 756)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad grass-6.2.1~/lib/init/init.sh grass-6.2.1/lib/init/init.sh
---- grass-6.2.1~/lib/init/init.sh	2007-04-04 15:12:40.000000000 +0200
-+++ grass-6.2.1/lib/init/init.sh	2007-04-04 15:14:27.000000000 +0200
+diff -urNad grass-6.2.2~/lib/init/init.sh grass-6.2.2/lib/init/init.sh
+--- grass-6.2.2~/lib/init/init.sh	2007-04-11 15:35:35.000000000 +0200
++++ grass-6.2.2/lib/init/init.sh	2007-04-11 15:37:48.000000000 +0200
 @@ -173,10 +173,12 @@
  
  # Set some environment variables if they are not set
@@ -15,7 +15,7 @@
 -    if [ -x /bin/more ] || [ -x /usr/bin/more ] ; then
 -        GRASS_PAGER=more
 +    if [ -x /usr/bin/pager ] ; then
-+    	GRASS_PAGER=pager
++     	GRASS_PAGER=pager
      elif [ -x /bin/less ] || [ -x /usr/bin/less ] ; then
          GRASS_PAGER=less
 +    elif [ -x /bin/more ] || [ -x /usr/bin/more ] ; then

Modified: packages/grass/trunk/debian/patches/www-browser.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/www-browser.dpatch	2007-04-11 08:15:35 UTC (rev 755)
+++ packages/grass/trunk/debian/patches/www-browser.dpatch	2007-04-11 18:06:52 UTC (rev 756)
@@ -5,9 +5,9 @@
 ## DP: Use www-browser as HTML browser, the Debian way
 
 @DPATCH@
-diff -urNad grass-6.2.1~/lib/init/init.sh grass-6.2.1/lib/init/init.sh
---- grass-6.2.1~/lib/init/init.sh	2006-10-19 13:20:41.000000000 +0200
-+++ grass-6.2.1/lib/init/init.sh	2007-04-11 10:14:14.000000000 +0200
+diff -urNad grass-6.2.2~/lib/init/init.sh grass-6.2.2/lib/init/init.sh
+--- grass-6.2.2~/lib/init/init.sh	2007-04-11 15:31:19.000000000 +0200
++++ grass-6.2.2/lib/init/init.sh	2007-04-11 15:33:57.000000000 +0200
 @@ -228,53 +228,11 @@
  CYGWIN=`uname | grep CYGWIN`
  
@@ -59,11 +59,11 @@
 -    echo "Searching for web browser, but neither konqueror, nor mozilla, opera, netscape found."
 -    # so we set konqueror, though, to make lib/gis/parser.c happy:
 -    GRASS_HTML_BROWSER=konqueror
-+	if [ -x /usr/bin/x-www-browser ] ; then
-+		GRASS_HTML_BROWSER=x-www-browser
++  	if [ -x /usr/bin/x-www-browser ] ; then
++  		GRASS_HTML_BROWSER=x-www-browser
 +	else 
-+		GRASS_HTML_BROWSER=true
-+	fi
++  		GRASS_HTML_BROWSER=true
++  	fi
  fi
  export GRASS_HTML_BROWSER
  

Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules	2007-04-11 08:15:35 UTC (rev 755)
+++ packages/grass/trunk/debian/rules	2007-04-11 18:06:52 UTC (rev 756)
@@ -42,6 +42,8 @@
                     --with-nls \
                     --with-glw \
                     --with-odbc \
+		    --with-sqlite \
+		    --enable-largefile \
                     --with-freetype-includes=/usr/include/freetype2 \
                     --with-tcltk-includes=/usr/include/tcl8.4 \
                     --with-postgres-includes=$(shell pg_config --includedir) \




More information about the Pkg-grass-devel mailing list