move httpinterface and servicediscovery from -ugly to gstlal

gstlal-ugly/debian/control.in

@@ -48,8 +48,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  libnds2-client (>= @MIN_NDS_VERSION@),
  libxml2,
  python (>= @MIN_PYTHON_VERSION@),
- python-avahi,
- python-dbus,
  python-glue (>= @MIN_GLUE_VERSION@),
  python-glue-segments (>= @MIN_GLUE_VERSION@),
  python-numpy,

gstlal-ugly/gstlal-ugly.spec.in

@@ -6,7 +6,7 @@ Release: 1.lscsoft
 Summary: GSTLAL Experimental Supplements
 License: GPL
 Group: LSC Software/Data Analysis
-Requires: gstlal >= @MIN_GSTLAL_VERSION@ python >= @MIN_PYTHON_VERSION@ glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ fftw >= 3 %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 1.2.4 %{gstreamername}-python >= 0.10.21 numpy scipy lal >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@ gsl ldas-tools-framecpp >= @MIN_FRAMECPP_VERSION@ gds-core >= @MIN_GDS_VERSION@ gds-crtools >= @MIN_GDS_VERSION@ gds-services >= @MIN_GDS_VERSION@ cyrus-sasl-lib nds2-client >= @MIN_NDS_VERSION@ orc >= @MIN_ORC_VERSION@ dbus-python avahi-ui-tools
+Requires: gstlal >= @MIN_GSTLAL_VERSION@ python >= @MIN_PYTHON_VERSION@ glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ fftw >= 3 %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 1.2.4 %{gstreamername}-python >= 0.10.21 numpy scipy lal >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@ gsl ldas-tools-framecpp >= @MIN_FRAMECPP_VERSION@ gds-core >= @MIN_GDS_VERSION@ gds-crtools >= @MIN_GDS_VERSION@ gds-services >= @MIN_GDS_VERSION@ cyrus-sasl-lib nds2-client >= @MIN_NDS_VERSION@ orc >= @MIN_ORC_VERSION@
 BuildRequires: doxygen graphviz gstlal-devel >= @MIN_GSTLAL_VERSION@ python-devel >= @MIN_PYTHON_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ lal-devel >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ gsl-devel ldas-tools-framecpp-devel >= @MIN_FRAMECPP_VERSION@ gds-devel >= @MIN_GDS_VERSION@ cyrus-sasl-devel nds2-client-devel >= @MIN_NDS_VERSION@ nds2-client-headers >= @MIN_NDS_VERSION@ orc >= @MIN_ORC_VERSION@
 Source: @PACKAGE_NAME@-%{version}.tar.gz
 URL: https://www.lsc-group.phys.uwm.edu/daswg/projects/gstlal.html

gstlal-ugly/python/Makefile.am

@@ -7,6 +7,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/gst/framecpp
 pkgpythondir = $(pkgpyexecdir)
 
 pkgpython_PYTHON = \
-	gviz_api.py \
-	httpinterface.py \
-	servicediscovery.py 
+	gviz_api.py

gstlal/debian/control.in

@@ -51,6 +51,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  libgsl0ldbl (>= 1.9),
  libxml2,
  python (>= @MIN_PYTHON_VERSION@),
+ python-avahi,
+ python-dbus,
  python-glue (>= @MIN_GLUE_VERSION@),
  python-glue-segments (>= @MIN_GLUE_VERSION@),
  python-numpy,

gstlal/gstlal.spec.in

@@ -6,7 +6,7 @@ Release: 1.lscsoft
 Summary: GSTLAL
 License: GPL
 Group: LSC Software/Data Analysis
-Requires: python >= @MIN_PYTHON_VERSION@ glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ fftw >= 3 %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 1.2.4 %{gstreamername}-python >= 0.10.21 numpy scipy lal >= @MIN_LAL_VERSION@ lal-python >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@ lalsimulation >= @MIN_LALSIMULATION_VERSION@ lalburst >= @MIN_LALBURST_VERSION@ lalinspiral >= @MIN_LALINSPIRAL_VERSION@ gsl orc >= @MIN_ORC_VERSION@
+Requires: python >= @MIN_PYTHON_VERSION@ glue >= @MIN_GLUE_VERSION@ glue-segments >= @MIN_GLUE_VERSION@ python-pylal >= @MIN_PYLAL_VERSION@ fftw >= 3 %{gstreamername} >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-good >= 1.2.4 %{gstreamername}-python >= 0.10.21 numpy scipy lal >= @MIN_LAL_VERSION@ lal-python >= @MIN_LAL_VERSION@ lalmetaio >= @MIN_LALMETAIO_VERSION@ lalsimulation >= @MIN_LALSIMULATION_VERSION@ lalburst >= @MIN_LALBURST_VERSION@ lalinspiral >= @MIN_LALINSPIRAL_VERSION@ gsl orc >= @MIN_ORC_VERSION@ dbus-python avahi-ui-tools
 BuildRequires: doxygen graphviz python-devel >= @MIN_PYTHON_VERSION@ gobject-introspection-devel >= @MIN_GOBJECT_INTROSPECTION_VERSION@ fftw-devel >= 3 %{gstreamername}-devel >= @MIN_GSTREAMER_VERSION@ %{gstreamername}-plugins-base-devel >= @MIN_GSTREAMER_VERSION@ numpy lal-devel >= @MIN_LAL_VERSION@ lal-python >= @MIN_LAL_VERSION@ lalmetaio-devel >= @MIN_LALMETAIO_VERSION@ lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@ lalburst-devel >= @MIN_LALBURST_VERSION@ lalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@ gsl-devel orc >= @MIN_ORC_VERSION@
 Source: @PACKAGE_NAME@-%{version}.tar.gz
 URL: https://www.lsc-group.phys.uwm.edu/daswg/projects/gstlal.html

gstlal/python/Makefile.am

@@ -15,6 +15,7 @@ pkgpython_PYTHON = \
 	dagparts.py \
 	datasource.py \
 	elements.py \
+	httpinterface.py \
 	matplotlibhelper.py \
 	misc.py \
 	multirate_datasource.py \
@@ -23,6 +24,7 @@ pkgpython_PYTHON = \
 	plotpsd.py \
 	plotutil.py \
 	reference_psd.py \
+	servicediscovery.py \
 	simplehandler.py \
 	simulation.py