[SCM] grass branch, master, updated. upstream/6.4.1-34-g071f8b1
Francesco Paolo Lovergine
frankie at debian.org
Thu Jan 19 13:43:45 UTC 2012
The following commit has been merged in the master branch:
commit 9d91a14216ea7020e8c88c940f58465d49976f72
Merge: 5b00ac22b4ff35fef6ea316bc25725f0e35f912e b00cb96835dd018060914c27e7444c9f5ec1bf0a
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Wed Nov 9 10:21:08 2011 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/grass
diff --combined debian/control
index 9f72f11,986318b..e5b95e2
--- a/debian/control
+++ b/debian/control
@@@ -3,7 -3,7 +3,7 @@@ Section: scienc
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 | libreadline6-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7),
+Build-depends: flex, bison, libreadline-dev | libreadline6-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 8),
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, libjpeg-dev,
libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
@@@ -19,9 -19,9 +19,9 @@@ Section: scienc
Architecture: any
Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, python (>= 2.5), python-numpy,
python-opengl, python-wxgtk2.8, ${misc:Depends}
-Suggests: gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
- gnuplot, xml2, wget | curl, netpbm, ghostscript, python-imaging, python-rpy2
-Recommends: grass-doc, python-wxgtk2.8
+Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
+ gnuplot, xml2, wget | curl, netpbm
+Recommends: ghostscript, python-wxgtk2.8
Provides: grass641
Description: Geographic Resources Analysis Support System
Commonly referred to as GRASS, this is a Geographic Information
@@@ -48,7 -48,8 +48,8 @@@ Description: Geographic Resources Analy
Package: grass-dev
Section: devel
Architecture: any
- Depends: grass (= ${binary:Version}), fakeroot, libproj-dev, libgdal1-dev, ${misc:Depends}
+ Depends: grass (= ${binary:Version}), libproj-dev, libgdal1-dev, ${misc:Depends}
+ Recommends: fakeroot, subversion
Suggests: pkg-config
Provides: grass64-dev
Description: GRASS GIS development files
--
Geographic Resources Analysis Support System
More information about the Pkg-grass-devel
mailing list