[grass] 01/01: Fix merge issues in control files.

[Bas Couwenberg]

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

sebastic pushed a commit to branch ubuntugis/trusty
in repository grass.

commit 8268c134e1a014c98d0de4c218470b0528e8afad
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 29 18:24:10 2016 +0100

    Fix merge issues in control files.
---
 debian/changelog  | 6 ++++++
 debian/control    | 8 ++++----
 debian/control.in | 6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 29a5a79..e2c550a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (7.2.0-1~trusty2) UNRELEASED; urgency=medium
+
+  * Fix merge issues in control files.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 29 Dec 2016 18:23:33 +0100
+
 grass (7.2.0-1~trusty1) trusty; urgency=medium
 
   * Rebuild for trusty.
diff --git a/debian/control b/debian/control
index 6b64271..f625b5f 100644
--- a/debian/control
+++ b/debian/control
@@ -74,15 +74,15 @@ Description: Geographic Resources Analysis Support System (GRASS GIS)
 
 Package: grass-core
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: grass-doc,
+         ${shlibs:Depends},
          ${python:Depends},
          ${misc:Depends}
 Recommends: gdal-bin,
 # cs2cs used by m.proj, gdalinfo+gdal_translate used by a number of scripts
             proj-bin
-Suggests: grass-doc,
+Suggests: grass-dev,
           grass-gui,
-          grass-dev,
 # used by v.in.e00
           e00compr,
           avce00,
@@ -98,7 +98,7 @@ Suggests: grass-doc,
           python-rpy2,
           python-termcolor
 Breaks: grass (<< 6.4.2-1~)
-Provides: grass720-2
+Provides: grass720
 Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS core components
  Commonly referred to as GRASS, this is a Geographic Information
diff --git a/debian/control.in b/debian/control.in
index 7f64198..e718d67 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -74,15 +74,15 @@ Description: Geographic Resources Analysis Support System (GRASS GIS)
 
 Package: grass-core
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: grass-doc,
+         ${shlibs:Depends},
          ${python:Depends},
          ${misc:Depends}
 Recommends: gdal-bin,
 # cs2cs used by m.proj, gdalinfo+gdal_translate used by a number of scripts
             proj-bin
-Suggests: grass-doc,
+Suggests: grass-dev,
           grass-gui,
-          grass-dev,
 # used by v.in.e00
           e00compr,
           avce00,

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