[SCM] grass branch, master, updated. upstream/6.4.0-16-g0ceb0a9

Francesco Paolo Lovergine frankie at debian.org
Tue Apr 12 21:19:41 UTC 2011


The following commit has been merged in the master branch:
commit eb35c5a69c6bbc08033307964d7bb19ef7aa5d3d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Apr 12 22:50:06 2011 +0200

    Fixed a few changes.

diff --git a/debian/changelog b/debian/changelog
index 6957bfd..a8aca59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 grass (6.4.1~rc2-1) unstable; urgency=low
 
   * New upstream release candidate.
+  * Now build-dep on libjpeg-dev and current libreadline6-dev.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 20 Mar 2011 10:56:46 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 20 Mar 2011 11:58:47 +0100
 
 grass (6.4.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6490721..0e14a64 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-depends: flex, bison,libreadline-dev | libreadline5-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), 
+Build-depends: flex, bison,libreadline-dev | libreadline6-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), 
  libtiff4-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5), libfftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev, 
- libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0), libproj-dev, proj-bin, libjpeg62-dev, 
+ libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0), libproj-dev, proj-bin, libjpeg-dev, 
  libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
  libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5), swig
 Standards-Version: 3.9.1
diff --git a/debian/control.in b/debian/control.in
index 17d2f56..81ada15 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,12 +3,12 @@ Section: science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-depends: flex, bison,libreadline-dev | libreadline5-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), 
+Build-depends: flex, bison,libreadline-dev | libreadline6-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), 
  libtiff4-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5), libfftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev, 
- libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0), libproj-dev, proj-bin, libjpeg62-dev, 
+ libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0), libproj-dev, proj-bin, libjpeg-dev, 
  libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
  libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5), swig
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Build-Conflicts: wx2.6-headers
 Homepage: http://grass.osgeo.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git

-- 
Geographic Resources Analysis Support System



More information about the Pkg-grass-devel mailing list