[grass] 01/01: Merge changes from experimental branch to sync packaging.
Bas Couwenberg
sebastic at debian.org
Fri Oct 28 18:06:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch ubuntugis/xenial
in repository grass.
commit 356ffbf9fe7f35e07e4fee799ff1eda728339b6a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 28 20:05:56 2016 +0200
Merge changes from experimental branch to sync packaging.
---
debian/changelog | 6 ++++++
debian/control | 45 +++++----------------------------------------
debian/control.in | 43 ++++---------------------------------------
3 files changed, 15 insertions(+), 79 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e76b0ff..821ec9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (7.2.0~rc1-1~exp1~xenial2) UNRELEASED; urgency=medium
+
+ * Merge changes from experimental branch to sync packaging.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Oct 2016 20:04:23 +0200
+
grass (7.2.0~rc1-1~exp1~xenial1) xenial; urgency=medium
* Rebuild for xenial.
diff --git a/debian/control b/debian/control
index 621bc2c..42e16cd 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: autoconf2.13,
flex,
graphviz,
libblas-dev,
+ libbz2-dev,
libcairo2-dev,
libfftw3-dev,
libfreetype6-dev,
@@ -50,7 +51,7 @@ Build-Depends: autoconf2.13,
zlib1g-dev
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/grass.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/grass.git -b ubuntugis/wily
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/grass.git -b ubuntugis/xenial
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,
@@ -103,14 +98,8 @@ Suggests: grass-doc,
python-rpy2,
python-termcolor
Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass70-core,
- grass7-core
-Provides: grass704-1,
- 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,
@@ -137,13 +126,7 @@ Recommends:
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,
@@ -182,12 +159,6 @@ Architecture: all
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,
@@ -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 62410f7..3de57bf 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,6 +14,7 @@ Build-Depends: autoconf2.13,
flex,
graphviz,
libblas-dev,
+ libbz2-dev,
libcairo2-dev,
libfftw3-dev,
libfreetype6-dev,
@@ -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,
@@ -103,14 +98,8 @@ Suggests: grass-doc,
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,
@@ -137,13 +126,7 @@ Recommends:
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,
@@ -182,12 +159,6 @@ Architecture: all
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,
@@ -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