More work on Debian dependencies

- more alphabetization of dependency lists
- add missing gir1.2-glib-2.0
- add other missing deps to gstlal-calibration
- remove libxml2 dependency (why was this added?)

gstlal-calibration/debian/control.in

@@ -20,23 +20,27 @@ Build-Depends:
 Package: gstlal-calibration
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python (>= @MIN_PYTHON_VERSION@),
- python-glue (>= @MIN_GLUE_VERSION@),
- python-glue-segments (>= @MIN_GLUE_VERSION@),
- python-pylal (>= @MIN_PYLAL_VERSION@),
+ gir1.2-glib-2.0,
+ gir1.2-gstreamer-1.0 (>= @MIN_GSTREAMER_VERSION@),
+ gir1.2-gst-plugins-base-1.0 (>= @MIN_GSTREAMER_VERSION@),
+ gstlal (>= @MIN_GSTLAL_VERSION@),
+ gstlal-ugly (>= @MIN_GSTLALUGLY_VERSION@),
  gstreamer1.0-plugins-base (>= @MIN_GSTREAMER_VERSION@),
  gstreamer1.0-plugins-good (>= @MIN_GSTREAMER_VERSION@),
- libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
- libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  gstreamer1.0-tools (>= @MIN_GSTREAMER_VERSION@),
- gir1.2-gstreamer-1.0 (>= @MIN_GSTREAMER_VERSION@),
- gir1.2-gst-plugins-base-1.0 (>= @MIN_GSTREAMER_VERSION@),
- python-numpy,
- python-scipy,
  lal (>= @MIN_LAL_VERSION@),
  lalmetaio (>= @MIN_LALMETAIO_VERSION@),
- gstlal (>= @MIN_GSTLAL_VERSION@),
- gstlal-ugly (>= @MIN_GSTLALUGLY_VERSION@)
+ libgirepository-1.0-1 (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
+ libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
+ python (>= @MIN_PYTHON_VERSION@),
+ python-gi,
+ python-glue (>= @MIN_GLUE_VERSION@),
+ python-glue-segments (>= @MIN_GLUE_VERSION@),
+ python-gst-1.0,
+ python-numpy,
+ python-pylal (>= @MIN_PYLAL_VERSION@),
+ python-scipy
 Conflicts:
  gstlal-ugly (<< 0.6.0)
 Description: GStreamer for GW data analysis (calibration parts)

gstlal-inspiral/debian/control.in

@@ -8,11 +8,11 @@ Build-Depends:
  debhelper (>= 8),
  doxygen (>= @MIN_DOXYGEN_VERSION@),
  fakeroot,
- gobject-introspection (>= @MIN_GOBJECT_INTROSPECTION_VERSION@)
- gtk-doc-tools (>= @MIN_GTK_DOC_VERSION@),
+ gobject-introspection (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
+ graphviz,
  gstlal-dev (>= @MIN_GSTLAL_VERSION@),
  gstlal-ugly-dev (>= @MIN_GSTLALUGLY_VERSION@),
- gtk-doc-tools,
+ gtk-doc-tools (>= @MIN_GTK_DOC_VERSION@),
  lal-dev (>= @MIN_LAL_VERSION@),
  lal-python (>= @MIN_LAL_VERSION@),
  lalinspiral-dev (>= @MIN_LALINSPIRAL_VERSION@),
@@ -22,7 +22,6 @@ Build-Depends:
  libgsl0-dev (>= 1.9),
  libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
- libxml2-dev,
  pkg-config,
  python-all-dev (>= @MIN_PYTHON_VERSION@),
  python-glue (>= @MIN_GLUE_VERSION@),
@@ -42,7 +41,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  libgsl0ldbl (>= 1.9),
  libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
- libxml2,
  python (>= @MIN_PYTHON_VERSION@),
  python-gi,
  python-glue (>= @MIN_GLUE_VERSION@),

gstlal-ugly/debian/control.in

@@ -12,20 +12,19 @@ Build-Depends:
  gds-dev (>= @MIN_GDS_VERSION@),
  gds-services (>= @MIN_GDS_VERSION@),
  gobject-introspection (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
+ graphviz,
  gstlal-dev (>= @MIN_GSTLAL_VERSION@),
  gtk-doc-tools  (>= @MIN_GTK_DOC_VERSION@),
- ldas-tools-framecpp-dev (>= @MIN_FRAMECPP_VERSION@),
- libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
- libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  lal-dev (>= @MIN_LAL_VERSION@),
  lalmetaio-dev (>= @MIN_LALMETAIO_VERSION@),
+ ldas-tools-framecpp-dev (>= @MIN_FRAMECPP_VERSION@),
  libfftw3-dev (>= 3),
  libgirepository1.0-dev (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
  libgsl0-dev (>= 1.9),
+ libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
+ libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  libnds2-client-dev (>= @MIN_NDS_VERSION@),
- liborc-0.4-0 (>= 1:@MIN_ORC_VERSION@),
  liborc-0.4-dev (>= 1:@MIN_ORC_VERSION@),
- libxml2-dev,
  pkg-config,
  python-all-dev (>= @MIN_PYTHON_VERSION@),
  python-glue (>= @MIN_GLUE_VERSION@),
@@ -37,10 +36,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  gds-core (>= @MIN_GDS_VERSION@),
  gds-crtools (>= @MIN_GDS_VERSION@),
  gds-services (>= @MIN_GDS_VERSION@),
+ gir1.2-glib-2.0,
+ gir1.2-gstreamer-1.0 (>= @MIN_GSTREAMER_VERSION@),
  gstlal (>= @MIN_GSTLAL_VERSION@),
- ldas-tools-framecpp (>= @MIN_FRAMECPP_VERSION@),
  lal (>= @MIN_LAL_VERSION@),
  lalmetaio (>= @MIN_LALMETAIO_VERSION@),
+ ldas-tools-framecpp (>= @MIN_FRAMECPP_VERSION@),
  libfftw3-3,
  libgirepository-1.0-1 (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
  libgsl0ldbl (>= 1.9),
@@ -48,7 +49,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  libnds2-client (>= @MIN_NDS_VERSION@),
  liborc-0.4-0 (>= 1:@MIN_ORC_VERSION@),
- libxml2,
  python (>= @MIN_PYTHON_VERSION@),
  python-gi,
  python-glue (>= @MIN_GLUE_VERSION@),

gstlal/debian/control.in

@@ -9,6 +9,7 @@ Build-Depends:
  doxygen (>= @MIN_DOXYGEN_VERSION@),
  fakeroot,
  gobject-introspection (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
+ graphviz,
  gtk-doc-tools (>= @MIN_GTK_DOC_VERSION@),
  lal-dev (>= @MIN_LAL_VERSION@),
  lal-python (>= @MIN_LAL_VERSION@),
@@ -23,7 +24,6 @@ Build-Depends:
  libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
  liborc-0.4-0 (>= 1:@MIN_ORC_VERSION@),
  liborc-0.4-dev (>= 1:@MIN_ORC_VERSION@),
- libxml2-dev,
  pkg-config,
  python-all-dev (>= @MIN_PYTHON_VERSION@),
  python-gi-dev,
@@ -35,13 +35,14 @@ Replaces: gstlal-ugly (<< 0.99.0)
 Breaks: gstlal-ugly (<< 0.99.0)
 Recommends: gstlal-ugly
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+ gir1.2-glib-2.0,
+ gir1.2-gstreamer-1.0 (>= @MIN_GSTREAMER_VERSION@),
+ gir1.2-gst-plugins-base-1.0 (>= @MIN_GSTREAMER_VERSION@),
  gstreamer1.0-plugins-base (>= @MIN_GSTREAMER_VERSION@),
  gstreamer1.0-plugins-good (>= @MIN_GSTREAMER_VERSION@),
  gstreamer1.0-plugins-bad,
  gstreamer1.0-plugins-ugly,
  gstreamer1.0-tools (>= @MIN_GSTREAMER_VERSION@),
- gir1.2-gstreamer-1.0 (>= @MIN_GSTREAMER_VERSION@),
- gir1.2-gst-plugins-base-1.0 (>= @MIN_GSTREAMER_VERSION@),
  lal (>= @MIN_LAL_VERSION@),
  lal-python (>= @MIN_LAL_VERSION@),
  lalburst (>= @MIN_LALBURST_VERSION@),
@@ -54,7 +55,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  liborc-0.4-0 (>= 1:@MIN_ORC_VERSION@),
- libxml2,
  python (>= @MIN_PYTHON_VERSION@),
  python-avahi,
  python-dbus,