[grass] 01/01: Merge changes from experimental branch to sync packaging.
Bas Couwenberg
sebastic at debian.org
Fri Oct 28 18:06:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch ubuntugis/trusty
in repository grass.
commit da0a1b72151462d2e181612aa931ce2d9e03442e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 28 19:47:57 2016 +0200
Merge changes from experimental branch to sync packaging.
---
debian/changelog | 6 ++++
debian/control | 95 ++++++++++++++++++-------------------------------------
debian/control.in | 95 ++++++++++++++++++-------------------------------------
3 files changed, 66 insertions(+), 130 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d4c5f4a..459d012 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (7.2.0~rc1-1~exp1~trusty2) UNRELEASED; urgency=medium
+
+ * Merge changes from experimental branch to sync packaging.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Oct 2016 19:46:46 +0200
+
grass (7.2.0~rc1-1~exp1~trusty1) trusty; urgency=medium
* Rebuild for trusty.
diff --git a/debian/control b/debian/control
index e12e77a..99050d1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,15 @@ Section: science
Priority: optional
Build-Depends: autoconf2.13,
autotools-dev,
+ bison,
debhelper (>= 9),
dh-python,
doxygen,
fakeroot,
flex,
- bison,
graphviz,
- libmotif-dev | lesstif2-dev,
+ libblas-dev,
+ libbz2-dev,
libcairo2-dev,
libfftw3-dev,
libfreetype6-dev,
@@ -21,36 +22,36 @@ Build-Depends: autoconf2.13,
libgeos-dev,
libglu1-mesa-dev,
libjpeg-dev,
- libpng-dev,
- libtiff-dev,
+ liblapack-dev,
+ liblas-c-dev (>= 1.8.0-3~),
+ libmotif-dev | lesstif2-dev,
libmysqlclient-dev,
libncurses5-dev,
+ libnetcdf-dev,
+ libpng-dev,
libpq-dev,
libproj-dev,
-# proj-bin needed for nad2bin during config
- proj-bin,
libreadline-dev,
libsqlite3-dev,
+ libtiff-dev,
libwxgtk2.8-dev,
libxmu-dev,
+ netcdf-bin,
# install optipng if compressing the PNG images in the programmers' manual
# optipng,
+# proj-bin needed for nad2bin during config
+ proj-bin,
python,
- python-wxgtk2.8,
python-dev,
python-numpy,
- python-ply,
python-pil,
- libnetcdf-dev,
- netcdf-bin,
- libblas-dev,
- liblapack-dev,
+ python-ply,
+ python-wxgtk2.8,
unixodbc-dev,
- zlib1g-dev,
- liblas-c-dev (>= 1.8.0-3~)
-Standards-Version: 3.9.6
+ zlib1g-dev
+Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/grass.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/grass.git -b ubuntugis/trusty
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/grass.git -b ubuntugis/trusty
Homepage: http://grass.osgeo.org/
Package: grass
@@ -61,12 +62,6 @@ Depends: grass-core,
${misc:Depends}
Recommends: grass-doc
Suggests: grass-dev
-Conflicts: grass70,
- grass7
-Provides: grass70,
- grass7
-Replaces: grass70,
- grass7
Description: Geographic Resources Analysis Support System (GRASS GIS)
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -81,8 +76,6 @@ Package: grass-core
Architecture: any
Depends: ${shlibs:Depends},
${python:Depends},
-# numpy used by the GRASS Python Library
- python-numpy,
${misc:Depends}
Recommends: gdal-bin,
# cs2cs used by m.proj, gdalinfo+gdal_translate used by a number of scripts
@@ -102,16 +95,11 @@ Suggests: grass-doc,
# used by NVIZ, d.out.gpsdrive, r.out.mpeg
netpbm,
# used by v.kridge
- python-rpy2
+ python-rpy2,
+ python-termcolor
Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass70-core,
- grass7-core
-Provides: grass703-2,
- grass70-core,
- grass7-core
-Replaces: grass70-core,
- grass7-core,
- grass (<< 6.4.2-1~)
+Provides: grass720-1
+Replaces: grass (<< 6.4.2-1~)
Description: GRASS GIS core components
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -125,25 +113,20 @@ Description: GRASS GIS core components
Package: grass-gui
Architecture: any
Depends: grass-core,
- ${python:Depends},
- python-wxgtk2.8,
# pyGL needed for wxNviz
python-opengl,
+ python-wxgtk2.8,
xterm | x-terminal-emulator,
+ ${python:Depends},
${misc:Depends}
Recommends:
# gs needed for wxPsmap PDF export
ghostscript,
# PIL needed for wxPsmap preview
- python-imaging
+ python-imaging,
+ python-matplotlib
Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass70-gui,
- grass7-gui
-Provides: grass70-gui,
- grass7-gui
-Replaces: grass (<< 6.4.2-1~),
- grass70-gui,
- grass7-gui
+Replaces: grass (<< 6.4.2-1~)
Description: GRASS GIS graphical user interfaces
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -160,12 +143,6 @@ Architecture: all
Depends: ${misc:Depends}
Suggests: grass,
grass-dev-doc
-Conflicts: grass70-doc,
- grass7-doc
-Provides: grass70-doc,
- grass7-doc
-Replaces: grass70-doc,
- grass7-doc
Description: GRASS GIS user documentation
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -179,15 +156,9 @@ Description: GRASS GIS user documentation
Package: grass-dev-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends},
- libjs-jquery
+Depends: libjs-jquery,
+ ${misc:Depends}
Suggests: grass
-Conflicts: grass70-dev-doc,
- grass7-dev-doc
-Provides: grass70-dev-doc,
- grass7-dev-doc
-Replaces: grass70-dev-doc,
- grass7-dev-doc
Description: GRASS GIS Programmers' Manual
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -204,10 +175,10 @@ Architecture: any
Depends: grass-core (= ${binary:Version}),
# fakeroot used by patches/htmlgen-fakeroot; see changelog entry for 5.7.0+6.0.0beta2-2
fakeroot,
- libproj-dev,
- libgdal-dev,
libfreetype6-dev,
+ libgdal-dev,
libpq-dev,
+ libproj-dev,
python,
${shlibs:Depends},
${misc:Depends}
@@ -215,12 +186,6 @@ Depends: grass-core (= ${binary:Version}),
Recommends: subversion
Suggests: grass-dev-doc,
pkg-config
-Conflicts: grass70-dev,
- grass7-dev
-Provides: grass70-dev,
- grass7-dev
-Replaces: grass70-dev,
- grass7-dev
Description: GRASS GIS development files
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
diff --git a/debian/control.in b/debian/control.in
index caa40d5..7f64198 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,14 +6,15 @@ Section: science
Priority: optional
Build-Depends: autoconf2.13,
autotools-dev,
+ bison,
debhelper (>= 9),
dh-python,
doxygen,
fakeroot,
flex,
- bison,
graphviz,
- libmotif-dev | lesstif2-dev,
+ libblas-dev,
+ libbz2-dev,
libcairo2-dev,
libfftw3-dev,
libfreetype6-dev,
@@ -21,36 +22,36 @@ Build-Depends: autoconf2.13,
libgeos-dev,
libglu1-mesa-dev,
libjpeg-dev,
- libpng-dev,
- libtiff-dev,
+ liblapack-dev,
+ liblas-c-dev (>= 1.8.0-3~),
+ libmotif-dev | lesstif2-dev,
libmysqlclient-dev,
libncurses5-dev,
+ libnetcdf-dev,
+ libpng-dev,
libpq-dev,
libproj-dev,
-# proj-bin needed for nad2bin during config
- proj-bin,
libreadline-dev,
libsqlite3-dev,
+ libtiff-dev,
libwxgtk3.0-dev,
libxmu-dev,
+ netcdf-bin,
# install optipng if compressing the PNG images in the programmers' manual
# optipng,
+# proj-bin needed for nad2bin during config
+ proj-bin,
python,
- python-wxgtk2.8,
python-dev,
python-numpy,
- python-ply,
python-pil,
- libnetcdf-dev,
- netcdf-bin,
- libblas-dev,
- liblapack-dev,
+ python-ply,
+ python-wxgtk2.8,
unixodbc-dev,
- zlib1g-dev,
- liblas-c-dev (>= 1.8.0-3~)
-Standards-Version: 3.9.6
+ zlib1g-dev
+Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/grass.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/grass.git -b ubuntugis/trusty
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/grass.git -b ubuntugis/trusty
Homepage: http://grass.osgeo.org/
Package: grass
@@ -61,12 +62,6 @@ Depends: grass-core,
${misc:Depends}
Recommends: grass-doc
Suggests: grass-dev
-Conflicts: grass at VERSION@,
- grass7
-Provides: grass at VERSION@,
- grass7
-Replaces: grass at VERSION@,
- grass7
Description: Geographic Resources Analysis Support System (GRASS GIS)
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -81,8 +76,6 @@ Package: grass-core
Architecture: any
Depends: ${shlibs:Depends},
${python:Depends},
-# numpy used by the GRASS Python Library
- python-numpy,
${misc:Depends}
Recommends: gdal-bin,
# cs2cs used by m.proj, gdalinfo+gdal_translate used by a number of scripts
@@ -102,16 +95,11 @@ Suggests: grass-doc,
# used by NVIZ, d.out.gpsdrive, r.out.mpeg
netpbm,
# used by v.kridge
- python-rpy2
+ python-rpy2,
+ python-termcolor
Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass at VERSION@-core,
- grass7-core
-Provides: grass at ABI@,
- grass at VERSION@-core,
- grass7-core
-Replaces: grass at VERSION@-core,
- grass7-core,
- grass (<< 6.4.2-1~)
+Provides: grass at ABI@
+Replaces: grass (<< 6.4.2-1~)
Description: GRASS GIS core components
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -125,25 +113,20 @@ Description: GRASS GIS core components
Package: grass-gui
Architecture: any
Depends: grass-core,
- ${python:Depends},
- python-wxgtk2.8,
# pyGL needed for wxNviz
python-opengl,
+ python-wxgtk2.8,
xterm | x-terminal-emulator,
+ ${python:Depends},
${misc:Depends}
Recommends:
# gs needed for wxPsmap PDF export
ghostscript,
# PIL needed for wxPsmap preview
- python-imaging
+ python-imaging,
+ python-matplotlib
Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass at VERSION@-gui,
- grass7-gui
-Provides: grass at VERSION@-gui,
- grass7-gui
-Replaces: grass (<< 6.4.2-1~),
- grass at VERSION@-gui,
- grass7-gui
+Replaces: grass (<< 6.4.2-1~)
Description: GRASS GIS graphical user interfaces
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -160,12 +143,6 @@ Architecture: all
Depends: ${misc:Depends}
Suggests: grass,
grass-dev-doc
-Conflicts: grass at VERSION@-doc,
- grass7-doc
-Provides: grass at VERSION@-doc,
- grass7-doc
-Replaces: grass at VERSION@-doc,
- grass7-doc
Description: GRASS GIS user documentation
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -179,15 +156,9 @@ Description: GRASS GIS user documentation
Package: grass-dev-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends},
- libjs-jquery
+Depends: libjs-jquery,
+ ${misc:Depends}
Suggests: grass
-Conflicts: grass at VERSION@-dev-doc,
- grass7-dev-doc
-Provides: grass at VERSION@-dev-doc,
- grass7-dev-doc
-Replaces: grass at VERSION@-dev-doc,
- grass7-dev-doc
Description: GRASS GIS Programmers' Manual
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -204,10 +175,10 @@ Architecture: any
Depends: grass-core (= ${binary:Version}),
# fakeroot used by patches/htmlgen-fakeroot; see changelog entry for 5.7.0+6.0.0beta2-2
fakeroot,
- libproj-dev,
- libgdal-dev,
libfreetype6-dev,
+ libgdal-dev,
libpq-dev,
+ libproj-dev,
python,
${shlibs:Depends},
${misc:Depends}
@@ -215,12 +186,6 @@ Depends: grass-core (= ${binary:Version}),
Recommends: subversion
Suggests: grass-dev-doc,
pkg-config
-Conflicts: grass at VERSION@-dev,
- grass7-dev
-Provides: grass at VERSION@-dev,
- grass7-dev
-Replaces: grass at VERSION@-dev,
- grass7-dev
Description: GRASS GIS development files
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git
More information about the Pkg-grass-devel
mailing list