From c5897b0629dd6a30a6d660d42c5b0543eb34cfa4 Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Fri, 28 Sep 2018 13:51:04 +0900
Subject: [PATCH] gstlal, -ugly, -inspiral:  glue-ligolw-tools update

- replace dependency on glue-ligolw-tools with python-ligo-lw now that the
  latter is in production
---
 gstlal-inspiral/configure.ac            | 1 +
 gstlal-inspiral/debian/control.in       | 2 +-
 gstlal-inspiral/gstlal-inspiral.spec.in | 2 +-
 gstlal-ugly/configure.ac                | 1 +
 gstlal-ugly/debian/control.in           | 2 +-
 gstlal-ugly/gstlal-ugly.spec.in         | 2 +-
 gstlal/configure.ac                     | 1 +
 gstlal/debian/control.in                | 2 +-
 gstlal/gstlal.spec.in                   | 2 +-
 9 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gstlal-inspiral/configure.ac b/gstlal-inspiral/configure.ac
index 1aa4d16adf..17870fc328 100644
--- a/gstlal-inspiral/configure.ac
+++ b/gstlal-inspiral/configure.ac
@@ -265,6 +265,7 @@ AC_SUBST([MIN_GLUE_VERSION], [1.59.2])
 AX_PYTHON_GLUE([$MIN_GLUE_VERSION])
 AC_SUBST([MIN_LIGO_SEGMENTS_VERSION], [1.0.0])
 AX_PYTHON_LIGO_SEGMENTS([$MIN_LIGO_SEGMENTS_VERSION])
+AC_SUBST([MIN_LIGO_LW_VERSION], [1.2.0])
 
 
 #
diff --git a/gstlal-inspiral/debian/control.in b/gstlal-inspiral/debian/control.in
index f5adbaaa58..dbc6491352 100644
--- a/gstlal-inspiral/debian/control.in
+++ b/gstlal-inspiral/debian/control.in
@@ -47,11 +47,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python (>= @MIN_PYTHON_VERSION@),
  python-gi,
  python-glue (>= @MIN_GLUE_VERSION@),
- python-glue-ligolw-tools,
  python-gobject,
  python-gst-1.0,
  python-h5py,
  python-ligo-gracedb (>= 1.11),
+ python-ligo-lw (>= @MIN_LIGO_LW_VERSION@),
  python-ligo-segments (>= @MIN_LIGO_SEGMENTS_VERSION@),
  python-numpy,
  python-scipy
diff --git a/gstlal-inspiral/gstlal-inspiral.spec.in b/gstlal-inspiral/gstlal-inspiral.spec.in
index 0045d52bf8..cf132e53d1 100644
--- a/gstlal-inspiral/gstlal-inspiral.spec.in
+++ b/gstlal-inspiral/gstlal-inspiral.spec.in
@@ -10,7 +10,7 @@ Requires: gstlal >= @MIN_GSTLAL_VERSION@
 Requires: gstlal-ugly >= @MIN_GSTLALUGLY_VERSION@
 Requires: python >= @MIN_PYTHON_VERSION@
 Requires: glue >= @MIN_GLUE_VERSION@
-Requires: python2-glue-ligolw-tools
+Requires: python-ligo-lw >= @MIN_LIGO_LW_VERSION@
 Requires: python2-ligo-segments >= @MIN_LIGO_SEGMENTS_VERSION@
 Requires: gobject-introspection >= @MIN_GOBJECT_INTROSPECTION_VERSION@
 Requires: %{gstreamername} >= @MIN_GSTREAMER_VERSION@
diff --git a/gstlal-ugly/configure.ac b/gstlal-ugly/configure.ac
index 96d8012226..db835ad13f 100644
--- a/gstlal-ugly/configure.ac
+++ b/gstlal-ugly/configure.ac
@@ -403,6 +403,7 @@ AC_SUBST([MIN_GLUE_VERSION], [1.59.2])
 AX_PYTHON_GLUE([$MIN_GLUE_VERSION])
 AC_SUBST([MIN_LIGO_SEGMENTS_VERSION], [1.0.0])
 AX_PYTHON_LIGO_SEGMENTS([$MIN_LIGO_SEGMENTS_VERSION])
+AC_SUBST([MIN_LIGO_LW_VERSION], [1.2.0])
 
 
 #
diff --git a/gstlal-ugly/debian/control.in b/gstlal-ugly/debian/control.in
index 43d3eadc2b..9fc8e4e95e 100644
--- a/gstlal-ugly/debian/control.in
+++ b/gstlal-ugly/debian/control.in
@@ -52,8 +52,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python (>= @MIN_PYTHON_VERSION@),
  python-gi,
  python-glue (>= @MIN_GLUE_VERSION@),
- python-glue-ligolw-tools,
  python-gst-1.0,
+ python-ligo-lw (>= @MIN_LIGO_LW_VERSION@),
  python-ligo-segments (>= @MIN_LIGO_SEGMENTS_VERSION@),
  python-numpy,
  python-scipy
diff --git a/gstlal-ugly/gstlal-ugly.spec.in b/gstlal-ugly/gstlal-ugly.spec.in
index 335fd6633f..0f50d23412 100644
--- a/gstlal-ugly/gstlal-ugly.spec.in
+++ b/gstlal-ugly/gstlal-ugly.spec.in
@@ -9,7 +9,7 @@ Group: LSC Software/Data Analysis
 Requires: gstlal >= @MIN_GSTLAL_VERSION@
 Requires: python >= @MIN_PYTHON_VERSION@
 Requires: glue >= @MIN_GLUE_VERSION@
-Requires: python2-glue-ligolw-tools
+Requires: python-ligo-lw >= @MIN_LIGO_LW_VERSION@
 Requires: python2-ligo-segments >= @MIN_LIGO_SEGMENTS_VERSION@
 Requires: gobject-introspection >= @MIN_GOBJECT_INTROSPECTION_VERSION@
 Requires: fftw >= 3
diff --git a/gstlal/configure.ac b/gstlal/configure.ac
index 5404903351..1355ef2349 100644
--- a/gstlal/configure.ac
+++ b/gstlal/configure.ac
@@ -342,6 +342,7 @@ AC_SUBST([MIN_GLUE_VERSION], [1.59.2])
 AX_PYTHON_GLUE([$MIN_GLUE_VERSION])
 AC_SUBST([MIN_LIGO_SEGMENTS_VERSION], [1.0.0])
 AX_PYTHON_LIGO_SEGMENTS([$MIN_LIGO_SEGMENTS_VERSION])
+AC_SUBST([MIN_LIGO_LW_VERSION], [1.2.0])
 
 
 #
diff --git a/gstlal/debian/control.in b/gstlal/debian/control.in
index df279b8644..459394d040 100644
--- a/gstlal/debian/control.in
+++ b/gstlal/debian/control.in
@@ -61,8 +61,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python-avahi,
  python-gi (>= @MIN_PYGOBJECT_VERSION@),
  python-glue (>= @MIN_GLUE_VERSION@),
- python-glue-ligolw-tools,
  python-gst-1.0,
+ python-ligo-lw (>= @MIN_LIGO_LW_VERSION@),
  python-ligo-segments (>= @MIN_LIGO_SEGMENTS_VERSION@),
  python-numpy,
  python-scipy
diff --git a/gstlal/gstlal.spec.in b/gstlal/gstlal.spec.in
index 0e585ee501..9d29cf2419 100644
--- a/gstlal/gstlal.spec.in
+++ b/gstlal/gstlal.spec.in
@@ -11,7 +11,7 @@ Requires: avahi-glib
 Requires: avahi-ui-tools
 Requires: fftw >= 3
 Requires: glue >= @MIN_GLUE_VERSION@
-Requires: python2-glue-ligolw-tools
+Requires: python-ligo-lw >= @MIN_LIGO_LW_VERSION@
 Requires: python2-ligo-segments >= @MIN_LIGO_SEGMENTS_VERSION@
 Requires: gobject-introspection >= @MIN_GOBJECT_INTROSPECTION_VERSION@
 Requires: gsl
-- 
GitLab