[grass] 01/02: Revert "Also Conflict with upstream grass7-daily packages."
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
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 7ef5647f9aa70f270948f01e5b9bb30a9cf2d2c7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Feb 25 22:53:33 2015 +0100
Revert "Also Conflict with upstream grass7-daily packages."
This reverts commit 30034ed40f2557a74ff209203e20147ed9a94ce2.
---
debian/control | 15 +++++----------
debian/control.in | 18 ++++++------------
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/debian/control b/debian/control
index 2be9bf6..bb4118a 100644
--- a/debian/control
+++ b/debian/control
@@ -61,8 +61,7 @@ Depends: grass-core,
Recommends: grass-doc
Suggests: grass-dev
Conflicts: grass70,
- grass7,
- grass7-daily
+ 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 +100,7 @@ Suggests: grass-doc,
python-rpy2
Breaks: grass (<< 6.4.2-1~)
Conflicts: grass70-core,
- grass7-core,
- grass7-daily-core
+ grass7-core
Provides: grass700
Replaces: grass (<< 6.4.2-1~)
Description: GRASS GIS core components
@@ -131,8 +129,7 @@ Recommends:
python-imaging
Breaks: grass (<< 6.4.2-1~)
Conflicts: grass70-gui,
- grass7-gui,
- grass7-daily-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
@@ -151,8 +148,7 @@ Depends: ${misc:Depends}
Suggests: grass,
grass-dev-doc
Conflicts: grass70-doc,
- grass7-doc,
- grass7-daily-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,
@@ -197,8 +193,7 @@ Depends: grass-core (= ${binary:Version}),
Recommends: subversion
Suggests: grass-dev-doc,
pkg-config
-Conflicts: grass7-dev,
- grass7-daily-dev
+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 b80b352..19b0585 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -61,8 +61,7 @@ Depends: grass-core,
Recommends: grass-doc
Suggests: grass-dev
Conflicts: grass at VERSION@,
- grass7,
- grass7-daily
+ 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 +100,7 @@ Suggests: grass-doc,
python-rpy2
Breaks: grass (<< 6.4.2-1~)
Conflicts: grass at VERSION@-core,
- grass7-core,
- grass7-daily-core
+ grass7-core
Provides: grass at ABI@
Replaces: grass (<< 6.4.2-1~)
Description: GRASS GIS core components
@@ -131,8 +129,7 @@ Recommends:
python-imaging
Breaks: grass (<< 6.4.2-1~)
Conflicts: grass at VERSION@-gui,
- grass7-gui,
- grass7-daily-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
@@ -151,8 +148,7 @@ Depends: ${misc:Depends}
Suggests: grass,
grass-dev-doc
Conflicts: grass at VERSION@-doc,
- grass7-doc,
- grass7-daily-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,
@@ -170,8 +166,7 @@ Depends: ${misc:Depends},
libjs-jquery
Suggests: grass
Conflicts: grass at VERSION@-dev-doc,
- grass7-dev-doc,
- grass7-daily-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,
@@ -199,8 +194,7 @@ Depends: grass-core (= ${binary:Version}),
Recommends: subversion
Suggests: grass-dev-doc,
pkg-config
-Conflicts: grass7-dev,
- grass7-daily-dev
+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
More information about the Pkg-grass-devel
mailing list