From 8efa5d2947e33b4b52be46151c750b62ee0c3f55 Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Wed, 5 Sep 2018 17:11:07 +0900
Subject: [PATCH] gstlal-ugly: fixes for removal of libgstlalugly.so
- the detchar trigger generator stuff got moved to gstlal-burst but the
packaging and build scripts got left with some stuff dangling here and
there. this patch comments out the relevant lines rather than removing
them so that it's easier to re-instate libgstlalugly.so later if needed
---
gstlal-ugly/configure.ac | 2 +-
gstlal-ugly/debian/changelog | 6 ++++++
gstlal-ugly/debian/gstlal-ugly-dev.install | 8 ++++----
gstlal-ugly/gst/lal/Makefile.am | 2 +-
gstlal-ugly/gst/multirate/Makefile.am | 2 --
gstlal-ugly/gst/nds/Makefile.am | 2 --
gstlal-ugly/gstlal-ugly.spec.in | 8 ++++----
gstlal-ugly/lib/Makefile.am | 10 +++++-----
8 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/gstlal-ugly/configure.ac b/gstlal-ugly/configure.ac
index eaf1649d33..b48cecc204 100644
--- a/gstlal-ugly/configure.ac
+++ b/gstlal-ugly/configure.ac
@@ -3,7 +3,7 @@
#
-AC_INIT([gstlal-ugly],[1.5.0],[gstlal-discuss@ligo.org],[gstlal-ugly])
+AC_INIT([gstlal-ugly],[1.5.1],[gstlal-discuss@ligo.org],[gstlal-ugly])
AC_COPYRIGHT([Copyright (C) 2008--2017 Kipp Cannon])
# a file whose existance can be used to use to check that we are in the
# top-level directory of the source tree
diff --git a/gstlal-ugly/debian/changelog b/gstlal-ugly/debian/changelog
index 3c3c7fa9ab..163bd6a31d 100644
--- a/gstlal-ugly/debian/changelog
+++ b/gstlal-ugly/debian/changelog
@@ -1,3 +1,9 @@
+gstlal-ugly (1.5.1-1) unstable; urgency=low
+
+ * packaging fixes for removal of libgstlalugly.so
+
+ -- Kipp Cannon <kipp.cannon@ligo.org> Wed, 05 Sep 2018 17:10:59 +0900
+
gstlal-ugly (1.5.0-1) unstable; urgency=low
* first pre-O2 release
diff --git a/gstlal-ugly/debian/gstlal-ugly-dev.install b/gstlal-ugly/debian/gstlal-ugly-dev.install
index 4939bfca15..9110b03e4f 100644
--- a/gstlal-ugly/debian/gstlal-ugly-dev.install
+++ b/gstlal-ugly/debian/gstlal-ugly-dev.install
@@ -1,5 +1,5 @@
-usr/lib/*/*.a
-usr/lib/*/*.so
-usr/lib/*/pkgconfig/*
+#usr/lib/*/*.a
+#usr/lib/*/*.so
+#usr/lib/*/pkgconfig/*
usr/lib/*/gstreamer-*/*a
-usr/include/*
+#usr/include/*
diff --git a/gstlal-ugly/gst/lal/Makefile.am b/gstlal-ugly/gst/lal/Makefile.am
index ad0d824cca..ff5f9eb68d 100644
--- a/gstlal-ugly/gst/lal/Makefile.am
+++ b/gstlal-ugly/gst/lal/Makefile.am
@@ -17,5 +17,5 @@ lib@GSTPLUGINPREFIX@gstlalugly_la_SOURCES = \
#gstlal_trim.h gstlal_trim.c
lib@GSTPLUGINPREFIX@gstlalugly_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) $(FFTW_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS)
-lib@GSTPLUGINPREFIX@gstlalugly_la_LIBADD = $(top_builddir)/lib/libgstlalugly.la
+#lib@GSTPLUGINPREFIX@gstlalugly_la_LIBADD = $(top_builddir)/lib/libgstlalugly.la
lib@GSTPLUGINPREFIX@gstlalugly_la_LDFLAGS = $(AM_LDFLAGS) $(GSL_LIBS) $(FFTW_LIBS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS) $(GSTLAL_PLUGIN_LDFLAGS)
diff --git a/gstlal-ugly/gst/multirate/Makefile.am b/gstlal-ugly/gst/multirate/Makefile.am
index 235b5865d8..9839207dd7 100644
--- a/gstlal-ugly/gst/multirate/Makefile.am
+++ b/gstlal-ugly/gst/multirate/Makefile.am
@@ -1,5 +1,3 @@
-noinst_HEADERS = multiratefirdecim.h multiratefirinterp.h
-
plugin_LTLIBRARIES = libgstmultirate.la
libgstmultirate_la_SOURCES = multirate.c \
diff --git a/gstlal-ugly/gst/nds/Makefile.am b/gstlal-ugly/gst/nds/Makefile.am
index 80449f3d93..83227b937b 100644
--- a/gstlal-ugly/gst/nds/Makefile.am
+++ b/gstlal-ugly/gst/nds/Makefile.am
@@ -5,5 +5,3 @@ plugin_LTLIBRARIES = libgstnds.la
libgstnds_la_SOURCES = ndssrc.h ndssrc.c
libgstnds_la_CFLAGS = $(AM_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) $(NDS_CFLAGS)
libgstnds_la_LDFLAGS = $(AM_LDFLAGS) $(GSTLAL_LIBS) $(gstreamer_LIBS) $(NDS_LIBS) $(GSTLAL_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = ndssrc.h
diff --git a/gstlal-ugly/gstlal-ugly.spec.in b/gstlal-ugly/gstlal-ugly.spec.in
index 4d926a9018..321543daac 100644
--- a/gstlal-ugly/gstlal-ugly.spec.in
+++ b/gstlal-ugly/gstlal-ugly.spec.in
@@ -123,8 +123,8 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}
%files devel
%defattr(-,root,root)
-%{_includedir}/gstlal-ugly
-%{_libdir}/*.a
-%{_libdir}/*.so
+#%{_includedir}/gstlal-ugly
+#%{_libdir}/*.a
+#%{_libdir}/*.so
%{_libdir}/gstreamer-@GSTREAMER_RELEASE@/*.a
-%{_libdir}/pkgconfig/*
+#%{_libdir}/pkgconfig/*
diff --git a/gstlal-ugly/lib/Makefile.am b/gstlal-ugly/lib/Makefile.am
index c61c48f95f..82e2af159e 100644
--- a/gstlal-ugly/lib/Makefile.am
+++ b/gstlal-ugly/lib/Makefile.am
@@ -1,7 +1,7 @@
pkginclude_HEADERS =
-pkgconfig_DATA = gstlal-ugly.pc
-lib_LTLIBRARIES = libgstlalugly.la
+#pkgconfig_DATA = gstlal-ugly.pc
+#lib_LTLIBRARIES = libgstlalugly.la
-libgstlalugly_la_SOURCES =
-libgstlalugly_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS)
-libgstlalugly_la_LDFLAGS = -version-info $(LIBVERSION) $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS)
+#libgstlalugly_la_SOURCES =
+#libgstlalugly_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS)
+#libgstlalugly_la_LDFLAGS = -version-info $(LIBVERSION) $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(gstreamer_LIBS)
--
GitLab