[qgis] 01/01: Add libgsl-dev as preferred build dependency, keep libgsl0-dev as alternative for backports.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Nov 7 23:18:34 UTC 2015


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

sebastic pushed a commit to branch master
in repository qgis.

commit ce259d6a5c52ec9a97be5b56f20e8c4854c2ce59
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Nov 6 15:56:15 2015 +0100

    Add libgsl-dev as preferred build dependency, keep libgsl0-dev as alternative for backports.
---
 debian/changelog  | 7 +++++++
 debian/control    | 4 ++--
 debian/control.in | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff216cd..318b28e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.8.3+dfsg-5) UNRELEASED; urgency=medium
+
+  * Add libgsl-dev as preferred build dependency,
+    keep libgsl0-dev as alternative for backports.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 Nov 2015 15:55:50 +0100
+
 qgis (2.8.3+dfsg-4) unstable; urgency=medium
 
   * Use desktop file in favor of menu file per CTTE #741573.
diff --git a/debian/control b/debian/control
index 59e3b4d..4021e34 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: bison,
                libfcgi-dev,
                libgdal-dev (>= 1.10.1-0~),
                libgeos-dev (>= 3.0.0),
-               libgsl0-dev,
+               libgsl-dev | libgsl0-dev,
                libpq-dev,
                libproj-dev,
                libqt4-dev (>= 4.7.0),
@@ -196,7 +196,7 @@ Depends:
          libexpat1-dev,
          libgdal-dev (>= 1.10.1-0~),
          libgeos-dev (>= 3.0.0),
-         libgsl0-dev,
+         libgsl-dev | libgsl0-dev,
          libpq-dev,
          libproj-dev,
          libqgis-core2.8.3 (= ${binary:Version}),
diff --git a/debian/control.in b/debian/control.in
index a2192b1..ede306f 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),
- libgsl0-dev,
+ libgsl-dev | libgsl0-dev,
  libpq-dev,
  libproj-dev,
  libqt4-dev (>= 4.7.0),
@@ -217,7 +217,7 @@ Depends:
 #saucy# libgdal-dev (>= 1.9.0),
 #wheezy# libgdal1-dev,
  libgeos-dev (>= 3.0.0),
- libgsl0-dev,
+ libgsl-dev | libgsl0-dev,
  libpq-dev,
  libproj-dev,
  libqgis-core{QGIS_ABI} (= ${binary:Version}),

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



More information about the Pkg-grass-devel mailing list