[grass] 01/01: Update Conflicts for grass7 upstream packages.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository grass.

commit 8c22ebdfd7ab7165a308df2742004f439b27c69c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 22 15:16:55 2015 +0100

    Update Conflicts for grass7 upstream packages.
---
 debian/changelog  |  2 +-
 debian/control    | 13 +++++++++----
 debian/control.in | 16 +++++++++++-----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45fbc9d..b0780d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 grass (7.0.0-1~exp2) UNRELEASED; urgency=medium
 
   * Use upstream grass startup script, and install custom x-grass7 as x-grass70.
-  * Add Conflicts to the grass70* packages provided by upstream.
+  * Add Conflicts to the grass7* packages provided by upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 21 Feb 2015 18:46:48 +0100
 
diff --git a/debian/control b/debian/control
index b37e313..bb4118a 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,8 @@ Depends: grass-core,
          ${misc:Depends}
 Recommends: grass-doc
 Suggests: grass-dev
-Conflicts: grass70
+Conflicts: 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,
@@ -98,7 +99,8 @@ Suggests: grass-doc,
 # used by v.kridge
           python-rpy2
 Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass70-core
+Conflicts: grass70-core,
+           grass7-core
 Provides: grass700
 Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS core components
@@ -126,7 +128,8 @@ Recommends:
 # PIL needed for wxPsmap preview
             python-imaging
 Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass70-gui
+Conflicts: 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
@@ -144,7 +147,8 @@ Architecture: all
 Depends: ${misc:Depends}
 Suggests: grass,
           grass-dev-doc
-Conflicts: grass70-doc
+Conflicts: 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,
@@ -189,6 +193,7 @@ Depends: grass-core (= ${binary:Version}),
 Recommends: subversion
 Suggests: grass-dev-doc,
           pkg-config
+Conflicts: grass7-dev
 Provides: grass70-dev
 Description: GRASS GIS development files
  Commonly referred to as GRASS, this is a Geographic Information
diff --git a/debian/control.in b/debian/control.in
index a1d2bf5..19b0585 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -60,7 +60,8 @@ Depends: grass-core,
          ${misc:Depends}
 Recommends: grass-doc
 Suggests: grass-dev
-Conflicts: grass at VERSION@
+Conflicts: 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,
@@ -98,7 +99,8 @@ Suggests: grass-doc,
 # used by v.kridge
           python-rpy2
 Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass at VERSION@-core
+Conflicts: grass at VERSION@-core,
+           grass7-core
 Provides: grass at ABI@
 Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS core components
@@ -126,7 +128,8 @@ Recommends:
 # PIL needed for wxPsmap preview
             python-imaging
 Breaks: grass (<< 6.4.2-1~)
-Conflicts: grass at VERSION@-gui
+Conflicts: 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
@@ -144,7 +147,8 @@ Architecture: all
 Depends: ${misc:Depends}
 Suggests: grass,
           grass-dev-doc
-Conflicts: grass at VERSION@-doc
+Conflicts: 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,
@@ -161,7 +165,8 @@ Architecture: all
 Depends: ${misc:Depends},
          libjs-jquery
 Suggests: grass
-Conflicts: grass at VERSION@-dev-doc
+Conflicts: 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,
@@ -189,6 +194,7 @@ Depends: grass-core (= ${binary:Version}),
 Recommends: subversion
 Suggests: grass-dev-doc,
           pkg-config
+Conflicts: grass7-dev
 Provides: grass at VERSION@-dev
 Description: GRASS GIS development files
  Commonly referred to as GRASS, this is a Geographic Information

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git