From e35c1dc5906c902485f4d153fc8e7632e0dce1de Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Thu, 11 Oct 2018 14:37:57 +0900
Subject: [PATCH] gstlal, gstlal-ugly, gstlal-inspiral:  update gsl deps

- update gsl dependencies for Debian following input from Steffen.
---
 gstlal-inspiral/debian/control.in | 6 ++----
 gstlal-ugly/debian/control.in     | 6 ++----
 gstlal/debian/control.in          | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/gstlal-inspiral/debian/control.in b/gstlal-inspiral/debian/control.in
index dbc6491352..095ba8c6a3 100644
--- a/gstlal-inspiral/debian/control.in
+++ b/gstlal-inspiral/debian/control.in
@@ -1,4 +1,3 @@
-# FIXME: remove libgsl0 deps when we can rely on a new-enough debian
 Source: gstlal-inspiral
 Maintainer: Carsten Aulbert <carsten.aulbert@aei.mpg.de>
 Section: lscsoft
@@ -21,7 +20,7 @@ Build-Depends:
  lalinspiral-python (>= @MIN_LALINSPIRAL_VERSION@),
  lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
  libgirepository1.0-dev (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
- libgsl-dev (>= 1.9) | libgsl0-dev (>= 1.9),
+ libgsl-dev (>= 1.9),
  libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  pkg-config,
@@ -41,7 +40,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  lalinspiral-python (>= @MIN_LALINSPIRAL_VERSION@),
  lalmetaio (>= @MIN_LALMETAIO_VERSION@),
  libgirepository-1.0-1 (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
- libgsl2 (>= 1.9) | libgsl0ldbl (>= 1.9),
  libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  python (>= @MIN_PYTHON_VERSION@),
@@ -72,7 +70,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  lal-dev (>= @MIN_LAL_VERSION@),
  lalinspiral-dev (>= @MIN_LALINSPIRAL_VERSION@),
  lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
- libgsl-dev (>= 1.9) | libgsl0-dev (>= 1.9),
+ libgsl-dev (>= 1.9),
  libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  python-all-dev (>= @MIN_PYTHON_VERSION@),
diff --git a/gstlal-ugly/debian/control.in b/gstlal-ugly/debian/control.in
index 9fc8e4e95e..fe1ffe457b 100644
--- a/gstlal-ugly/debian/control.in
+++ b/gstlal-ugly/debian/control.in
@@ -1,4 +1,3 @@
-# FIXME: remove libgsl0 deps when we can rely on a new-enough debian
 Source: gstlal-ugly
 Maintainer: Carsten Aulbert <carsten.aulbert@aei.mpg.de>
 Section: lscsoft
@@ -21,7 +20,7 @@ Build-Depends:
  ldas-tools-framecpp-dev (>= @MIN_FRAMECPP_VERSION@),
  libfftw3-dev (>= 3),
  libgirepository1.0-dev (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
- libgsl-dev (>= 1.9) | libgsl0-dev (>= 1.9),
+ libgsl-dev (>= 1.9),
  libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libnds2-client-dev (>= @MIN_NDS_VERSION@),
@@ -44,7 +43,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  ldas-tools-framecpp (>= @MIN_FRAMECPP_VERSION@),
  libfftw3-3,
  libgirepository-1.0-1 (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
- libgsl2 (>= 1.9) | libgsl0ldbl (>= 1.9),
  libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  libnds2-client (>= @MIN_NDS_VERSION@),
@@ -74,7 +72,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  lal-dev (>= @MIN_LAL_VERSION@),
  lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
  libfftw3-dev,
- libgsl-dev (>= 1.9) | libgsl0-dev (>= 1.9),
+ libgsl-dev (>= 1.9),
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libreadline-dev
diff --git a/gstlal/debian/control.in b/gstlal/debian/control.in
index 459394d040..6c34f41dcb 100644
--- a/gstlal/debian/control.in
+++ b/gstlal/debian/control.in
@@ -1,4 +1,3 @@
-# FIXME:  remove libgsl0 deps when we can rely on a new-enough debian
 Source: gstlal
 Maintainer: Carsten Aulbert <carsten.aulbert@aei.mpg.de>
 Section: lscsoft
@@ -21,7 +20,7 @@ Build-Depends:
  lalsimulation-dev (>= @MIN_LALSIMULATION_VERSION@),
  libfftw3-dev (>= 3),
  libgirepository1.0-dev (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
- libgsl-dev (>= 1.9) | libgsl0-dev (>= 1.9),
+ libgsl-dev (>= 1.9),
  libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  liborc-0.4-dev (>= 1:@MIN_ORC_VERSION@),
@@ -53,7 +52,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  libavahi-glib1,
  libfftw3-3,
  libgirepository-1.0-1 (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
- libgsl2 (>= 1.9) | libgsl0ldbl (>= 1.9),
  libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  liborc-0.4-0 (>= 1:@MIN_ORC_VERSION@),
@@ -94,7 +92,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
  lalsimulation-dev (>= @MIN_LALSIMULATION_VERSION@),
  libfftw3-dev (>= 3),
- libgsl-dev (>= 1.9) | libgsl0-dev (>= 1.9),
+ libgsl-dev (>= 1.9),
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  python-all-dev (>= @MIN_PYTHON_VERSION@)
-- 
GitLab