[grass] 02/02: Also Conflict with upstream grass7-daily 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 30034ed40f2557a74ff209203e20147ed9a94ce2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 22 15:37:10 2015 +0100

    Also Conflict with upstream grass7-daily packages.
---
 debian/changelog  |  2 +-
 debian/control    | 15 ++++++++++-----
 debian/control.in | 18 ++++++++++++------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0780d0..96baea7 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 grass7* packages provided by upstream.
+  * Add Conflicts on 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 bb4118a..2be9bf6 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,8 @@ Depends: grass-core,
 Recommends: grass-doc
 Suggests: grass-dev
 Conflicts: grass70,
-           grass7
+           grass7,
+           grass7-daily
 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,
@@ -100,7 +101,8 @@ Suggests: grass-doc,
           python-rpy2
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass70-core,
-           grass7-core
+           grass7-core,
+           grass7-daily-core
 Provides: grass700
 Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS core components
@@ -129,7 +131,8 @@ Recommends:
             python-imaging
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass70-gui,
-           grass7-gui
+           grass7-gui,
+           grass7-daily-gui
 Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS graphical user interfaces
  Commonly referred to as GRASS, this is a Geographic Information
@@ -148,7 +151,8 @@ Depends: ${misc:Depends}
 Suggests: grass,
           grass-dev-doc
 Conflicts: grass70-doc,
-           grass7-doc
+           grass7-doc,
+           grass7-daily-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,
@@ -193,7 +197,8 @@ Depends: grass-core (= ${binary:Version}),
 Recommends: subversion
 Suggests: grass-dev-doc,
           pkg-config
-Conflicts: grass7-dev
+Conflicts: grass7-dev,
+           grass7-daily-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 19b0585..b80b352 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -61,7 +61,8 @@ Depends: grass-core,
 Recommends: grass-doc
 Suggests: grass-dev
 Conflicts: grass at VERSION@,
-           grass7
+           grass7,
+           grass7-daily
 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,
@@ -100,7 +101,8 @@ Suggests: grass-doc,
           python-rpy2
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass at VERSION@-core,
-           grass7-core
+           grass7-core,
+           grass7-daily-core
 Provides: grass at ABI@
 Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS core components
@@ -129,7 +131,8 @@ Recommends:
             python-imaging
 Breaks: grass (<< 6.4.2-1~)
 Conflicts: grass at VERSION@-gui,
-           grass7-gui
+           grass7-gui,
+           grass7-daily-gui
 Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS graphical user interfaces
  Commonly referred to as GRASS, this is a Geographic Information
@@ -148,7 +151,8 @@ Depends: ${misc:Depends}
 Suggests: grass,
           grass-dev-doc
 Conflicts: grass at VERSION@-doc,
-           grass7-doc
+           grass7-doc,
+           grass7-daily-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,
@@ -166,7 +170,8 @@ Depends: ${misc:Depends},
          libjs-jquery
 Suggests: grass
 Conflicts: grass at VERSION@-dev-doc,
-           grass7-dev-doc
+           grass7-dev-doc,
+           grass7-daily-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,7 +199,8 @@ Depends: grass-core (= ${binary:Version}),
 Recommends: subversion
 Suggests: grass-dev-doc,
           pkg-config
-Conflicts: grass7-dev
+Conflicts: grass7-dev,
+           grass7-daily-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