[qgis] 10/14: Drop changes from upstrema control.in.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit 3708d9eb028078d17f42acf03bc7dcc969223912
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 1 21:00:55 2015 +0100

    Drop changes from upstrema control.in.
---
 debian/control.in | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 2ce3365..baff09d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -17,7 +17,7 @@ Build-Depends:
 #saucy# libgdal-dev (>= 1.9.0),
 #wheezy# libgdal1-dev,
  libgeos-dev (>= 3.0.0),
- libgsl-dev | libgsl0-dev,
+ libgsl0-dev,
  libpq-dev,
  libproj-dev,
  libqt4-dev (>= 4.7.0),
@@ -68,7 +68,6 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- python-qgis (= ${binary:Version}),
  qgis-providers (= ${binary:Version}),
  qgis-common (= ${source:Version})
 Recommends:
@@ -149,18 +148,18 @@ Description: QGIS - shared network analysis library
  .
  This package contains the shared network analysis library.
 
-#!sid#Package: libqgisgrass{QGIS_ABI}
-#!sid#Architecture: any
-#!sid#Section: libs
-#!sid#Depends:
-#!sid# ${shlibs:Depends},
-#!sid# ${misc:Depends}
-#!sid#Replaces: libqgis{QGIS_ABI}
-#!sid#Description: QGIS - shared grass library
-#!sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
-#!sid# display databases of geographic information.
-#!sid# .
-#!sid# This package contains the shared grass library.
+Package: libqgisgrass{QGIS_ABI}
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis{QGIS_ABI}
+Description: QGIS - shared grass library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared grass library.
 
 Package: libqgispython{QGIS_ABI}
 Architecture: any
@@ -221,7 +220,7 @@ Depends:
 #saucy# libgdal-dev (>= 1.9.0),
 #wheezy# libgdal1-dev,
  libgeos-dev (>= 3.0.0),
- libgsl-dev | libgsl0-dev,
+ libgsl0-dev,
  libpq-dev,
  libproj-dev,
  libqgis-core{QGIS_ABI} (= ${binary:Version}),
@@ -229,7 +228,7 @@ Depends:
  libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
  libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
  libqgis-server{QGIS_ABI} (= ${binary:Version}),
-#!sid# libqgisgrass{QGIS_ABI} (= ${binary:Version}),
+ libqgisgrass{QGIS_ABI} (= ${binary:Version}),
  libqgispython{QGIS_ABI} (= ${binary:Version}),
  libqt4-dev (>= 4.7.0),
  libsqlite3-dev,
@@ -250,8 +249,6 @@ Description: QGIS - development files
 
 Package: qgis-provider-grass
 Architecture: any
-Section: debug
-Priority: extra
 Depends:
  qgis (= ${binary:Version}),
  ${shlibs:Depends},

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