[grass] 02/02: Add Conflicts/Provides/Replaces on the grass7* packages by upstream.

Fri Mar 27 13:24:14 UTC 2015

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

sebastic pushed a commit to branch experimental
in repository grass.

commit 1fe46bbfc577d339d242748c698d015519ad0c9e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Feb 25 23:29:14 2015 +0100

    Add Conflicts/Provides/Replaces on the grass7* packages by upstream.
---
 debian/changelog  |  2 +-
 debian/control    | 37 +++++++++++++++++++++++++++++++------
 debian/control.in | 34 +++++++++++++++++++++++++++++-----
 3 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96baea7..c55fd4d 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 on the grass7* packages provided by upstream.
+  * Add Conflicts/Provides/Replaces on the grass7* packages 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 bb4118a..cd05708 100644
--- a/debian/control
+++ b/debian/control
@@ -62,6 +62,10 @@ 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,
@@ -101,8 +105,12 @@ Suggests: grass-doc,
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass70-core,
            grass7-core
-Provides: grass700
-Replaces: grass (<< 6.4.2-1~)
+Provides: grass700,
+          grass70-core,
+          grass7-core
+Replaces: grass70-core,
+          grass7-core,
+          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,
@@ -130,7 +138,11 @@ Recommends:
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass70-gui,
            grass7-gui
-Replaces: grass (<< 6.4.2-1~)
+Provides: grass70-gui,
+          grass7-gui
+Replaces: grass (<< 6.4.2-1~),
+          grass70-gui,
+          grass7-gui
 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,
@@ -149,6 +161,10 @@ 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,
@@ -165,7 +181,12 @@ Architecture: all
 Depends: ${misc:Depends},
          libjs-jquery
 Suggests: grass
-Conflicts: grass70-dev-doc
+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,
@@ -193,8 +214,12 @@ Depends: grass-core (= ${binary:Version}),
 Recommends: subversion
 Suggests: grass-dev-doc,
           pkg-config
-Conflicts: grass7-dev
-Provides: grass70-dev
+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 19b0585..1ff1b1e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -62,6 +62,10 @@ 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,
@@ -101,8 +105,12 @@ Suggests: grass-doc,
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass at VERSION@-core,
            grass7-core
-Provides: grass at ABI@
-Replaces: grass (<< 6.4.2-1~)
+Provides: grass at ABI@,
+          grass at VERSION@-core,
+          grass7-core
+Replaces: grass at VERSION@-core,
+          grass7-core,
+          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,
@@ -130,7 +138,11 @@ Recommends:
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass at VERSION@-gui,
            grass7-gui
-Replaces: grass (<< 6.4.2-1~)
+Provides: grass at VERSION@-gui,
+          grass7-gui
+Replaces: grass (<< 6.4.2-1~),
+          grass at VERSION@-gui,
+          grass7-gui
 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,
@@ -149,6 +161,10 @@ 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,
@@ -167,6 +183,10 @@ Depends: ${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,
@@ -194,8 +214,12 @@ Depends: grass-core (= ${binary:Version}),
 Recommends: subversion
 Suggests: grass-dev-doc,
           pkg-config
-Conflicts: grass7-dev
-Provides: grass at VERSION@-dev
+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

