This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository grass.
commit 7575756cbcfc708e9d6595df7004f43a3fe62b51 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Feb 21 20:12:00 2015 +0100 Add Conflicts to the grass70* packages provided by upstream. --- debian/changelog | 1 + debian/control | 5 +++++ debian/control.in | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 654922a..45fbc9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +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. -- Bas Couwenberg <sebas...@debian.org> Sat, 21 Feb 2015 18:46:48 +0100 diff --git a/debian/control b/debian/control index b30bc92..b37e313 100644 --- a/debian/control +++ b/debian/control @@ -60,6 +60,7 @@ Depends: grass-core, ${misc:Depends} Recommends: grass-doc Suggests: grass-dev +Conflicts: grass70 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, @@ -97,6 +98,7 @@ Suggests: grass-doc, # used by v.kridge python-rpy2 Breaks: grass (<< 6.4.2-1~) +Conflicts: grass70-core Provides: grass700 Replaces: grass (<< 6.4.2-1~) Description: GRASS GIS core components @@ -124,6 +126,7 @@ Recommends: # PIL needed for wxPsmap preview python-imaging Breaks: grass (<< 6.4.2-1~) +Conflicts: grass70-gui Replaces: grass (<< 6.4.2-1~) Description: GRASS GIS graphical user interfaces Commonly referred to as GRASS, this is a Geographic Information @@ -141,6 +144,7 @@ Architecture: all Depends: ${misc:Depends} Suggests: grass, grass-dev-doc +Conflicts: grass70-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, @@ -157,6 +161,7 @@ Architecture: all Depends: ${misc:Depends}, libjs-jquery Suggests: grass +Conflicts: grass70-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, diff --git a/debian/control.in b/debian/control.in index 1252bff..a1d2bf5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -60,6 +60,7 @@ Depends: grass-core, ${misc:Depends} Recommends: grass-doc Suggests: grass-dev +Conflicts: grass@VERSION@ 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, @@ -97,6 +98,7 @@ Suggests: grass-doc, # used by v.kridge python-rpy2 Breaks: grass (<< 6.4.2-1~) +Conflicts: grass@VERSION@-core Provides: grass@ABI@ Replaces: grass (<< 6.4.2-1~) Description: GRASS GIS core components @@ -124,6 +126,7 @@ Recommends: # PIL needed for wxPsmap preview python-imaging Breaks: grass (<< 6.4.2-1~) +Conflicts: grass@VERSION@-gui Replaces: grass (<< 6.4.2-1~) Description: GRASS GIS graphical user interfaces Commonly referred to as GRASS, this is a Geographic Information @@ -141,6 +144,7 @@ Architecture: all Depends: ${misc:Depends} Suggests: grass, grass-dev-doc +Conflicts: grass@VERSION@-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, @@ -157,6 +161,7 @@ Architecture: all Depends: ${misc:Depends}, libjs-jquery Suggests: grass +Conflicts: grass@VERSION@-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, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel