From 645f5dd2f73203e7ed82496ec0ef11cda14cc613 Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Thu, 13 Dec 2012 16:39:00 -0500
Subject: [PATCH] update Debian build scripts following patches from Steffen

---
 gstlal-inspiral/debian/changelog              |  7 ++-
 gstlal-inspiral/debian/control                | 48 ++++++++++++-----
 gstlal-inspiral/debian/copyright              |  1 +
 .../debian/gstlal-inspiral-dev.install        |  5 ++
 .../debian/gstlal-inspiral.install            |  5 ++
 gstlal-inspiral/debian/rules                  | 10 ++--
 gstlal-inspiral/debian/source/format          |  1 +
 gstlal-ugly/debian/changelog                  | 10 ++++
 gstlal-ugly/debian/control                    | 54 +++++++++++++------
 gstlal-ugly/debian/copyright                  |  1 +
 gstlal-ugly/debian/gstlal-ugly-dev.install    |  5 ++
 gstlal-ugly/debian/gstlal-ugly.install        |  5 ++
 gstlal-ugly/debian/rules                      | 10 ++--
 gstlal-ugly/debian/source/format              |  1 +
 gstlal/debian/changelog                       | 10 ++++
 gstlal/debian/control                         | 45 +++++++++++-----
 gstlal/debian/copyright                       |  1 +
 gstlal/debian/gstlal-dev.install              |  5 ++
 gstlal/debian/gstlal.install                  |  5 ++
 gstlal/debian/rules                           | 14 +++--
 gstlal/debian/source/format                   |  1 +
 21 files changed, 191 insertions(+), 53 deletions(-)
 create mode 100644 gstlal-inspiral/debian/gstlal-inspiral-dev.install
 create mode 100644 gstlal-inspiral/debian/gstlal-inspiral.install
 create mode 100644 gstlal-inspiral/debian/source/format
 create mode 100644 gstlal-ugly/debian/gstlal-ugly-dev.install
 create mode 100644 gstlal-ugly/debian/gstlal-ugly.install
 create mode 100644 gstlal-ugly/debian/source/format
 create mode 100644 gstlal/debian/gstlal-dev.install
 create mode 100644 gstlal/debian/gstlal.install
 create mode 100644 gstlal/debian/source/format

diff --git a/gstlal-inspiral/debian/changelog b/gstlal-inspiral/debian/changelog
index 6ec2c3dc1e..14b61c16cb 100644
--- a/gstlal-inspiral/debian/changelog
+++ b/gstlal-inspiral/debian/changelog
@@ -1,5 +1,8 @@
-gstlal-inspiral (0.1.0-1) unstable; urgency=low
+gstlal-inspiral (0.1.0~beta0-3) unstable; urgency=low
 
-  * First release
+  * First release 0.1.0
+  * Rebuild with source format 3.0, dh_python2
+  * Split off -dev package
+  * Adjusted description texts
 
  -- Kipp Cannon <kipp.cannon@ligo.org>  Wed, 07 Nov 2012 12:00:00 -0500
diff --git a/gstlal-inspiral/debian/control b/gstlal-inspiral/debian/control
index e854d6e1d1..791cfb0fc8 100644
--- a/gstlal-inspiral/debian/control
+++ b/gstlal-inspiral/debian/control
@@ -3,24 +3,26 @@ Maintainer: Carsten Aulbert <carsten.aulbert@aei.mpg.de>
 Section: lscsoft
 Priority: optional
 Standards-Version: 3.9.2
+X-Python-Version: >= 2.6
 Build-Depends:
  debhelper (>= 8),
- python-dev (>= 2.6),
- gstlal-dep (>= 0.2.2),
+ python-all-dev (>= 2.6),
+ gstlal-dep (>= 2.2) | gstenvironment,
  python-gobject-dev,
  lal-dev (>= 6.7.0),
  lalmetaio-dev (>= 1.0.4),
  lalinspiral-dev (>= 1.3.0),
+ python-glue (>= 1.42),
  libgsl0-dev (>= 1.9),
  fakeroot,
- autoconf,
  pkg-config,
  libxml2-dev,
- gstlal-dev (>=0.5.0)
+ gstlal-dev (>= 0.5.0),
+ gstlal-ugly-dev (>= 0.4.0)
 
 Package: gstlal-inspiral
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python (>= 2.6),
  python-glue (>= 1.42),
  python-glue-segments (>= 1.42),
@@ -33,12 +35,30 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
  lalinspiral (>= 1.3.0),
  libgsl0 (>= 1.9),
  libxml2,
- gstlal (>=0.5.0)
- gstlal-ugly (>=0.4.0)
-Description: GStreamer version of LAL (inspiral part)
- gstlal provides a suite of GStreamer elements that expose
- gravitational-wave data analysis tools from the LAL library for use
- in GStreamer signal-processing pipelines. Examples include an element
- to add simulated gravitational waves to an h(t) stream, and source
- elements that can provide data from .gwf frame files or NDS
- servers to a GStreamer pipeline.
+ gstlal (>= 0.5.0),
+ gstlal-ugly (>= 0.4.0)
+Description: GStreamer for GW data analysis (inspiral parts)
+ This package provides a variety of gstreamer elements for
+ gravitational-wave data analysis and some libraries to help write such
+ elements.  The code here sits on top of several other libraries, notably
+ the LIGO Algorithm Library (LAL), FFTW, the GNU Scientific Library (GSL),
+ and, of course, GStreamer.
+ This package contains plugins, libraries, and programs for inspiral data
+ analysis.
+
+Package: gstlal-inspiral-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, 
+ python-all-dev (>= 2.6),
+ python-gobject-dev,
+ lal-dev (>= 6.7.0),
+ lalmetaio-dev (>= 1.0.4),
+ lalinspiral-dev (>= 1.3.0),
+ python-glue (>= 1.42),
+ libgsl0-dev (>= 1.9),
+ gstlal-inspiral (= ${binary:Version}),
+ gstlal-dev (>= 0.5.0),
+ gstlal-ugly-dev (>= 0.4.0)
+Description: Files and documentation needed for compiling gstlal-inspiral based plugins and programs.
+ This package contains the files needed for building gstlal-inspiral based
+ plugins and programs.
diff --git a/gstlal-inspiral/debian/copyright b/gstlal-inspiral/debian/copyright
index e69de29bb2..5852795b4d 100644
--- a/gstlal-inspiral/debian/copyright
+++ b/gstlal-inspiral/debian/copyright
@@ -0,0 +1 @@
+License: GPL
diff --git a/gstlal-inspiral/debian/gstlal-inspiral-dev.install b/gstlal-inspiral/debian/gstlal-inspiral-dev.install
new file mode 100644
index 0000000000..29d6028b3f
--- /dev/null
+++ b/gstlal-inspiral/debian/gstlal-inspiral-dev.install
@@ -0,0 +1,5 @@
+usr/lib/*a
+usr/lib/*.so
+usr/lib/pkgconfig/*
+usr/lib/gstreamer-*/*a
+usr/include/*
diff --git a/gstlal-inspiral/debian/gstlal-inspiral.install b/gstlal-inspiral/debian/gstlal-inspiral.install
new file mode 100644
index 0000000000..293164208a
--- /dev/null
+++ b/gstlal-inspiral/debian/gstlal-inspiral.install
@@ -0,0 +1,5 @@
+usr/bin/*
+usr/lib/*.so.*
+usr/lib/gstreamer-*/*.so*
+usr/lib/gstreamer-*/python/*
+usr/lib/python*/*/gstlal
diff --git a/gstlal-inspiral/debian/rules b/gstlal-inspiral/debian/rules
index 781a8ec1cc..9612ea7ad5 100755
--- a/gstlal-inspiral/debian/rules
+++ b/gstlal-inspiral/debian/rules
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 %:
-	. /opt/lscsoft/gst/etc/gstlal.sh; dh $@
+	. /opt/lscsoft/gst/etc/gstenvironment.sh; \
+	dh $@ --with=python2
 
 override_dh_auto_test:
-	. /opt/lscsoft/gst/etc/gstlal.sh; export PYTHONPATH=$$(pwd)/python; dh $@
+	. /opt/lscsoft/gst/etc/gstenvironment.sh; \
+	export PYTHONPATH=$$(pwd)/python; \
+	dh $@
 
 override_dh_shlibdeps:
-	. /opt/lscsoft/gst/etc/gstlal.sh; dh "$@" -Xlibgstaudio-0.10.so.0
+	. /opt/lscsoft/gst/etc/gstenvironment.sh; \
+	dh "$@" -Xlibgstaudio-0.10.so.0
diff --git a/gstlal-inspiral/debian/source/format b/gstlal-inspiral/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/gstlal-inspiral/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/gstlal-ugly/debian/changelog b/gstlal-ugly/debian/changelog
index 98587e65b6..325d54d56f 100644
--- a/gstlal-ugly/debian/changelog
+++ b/gstlal-ugly/debian/changelog
@@ -1,3 +1,12 @@
+gstlal-ugly (0.4.0~beta0-6) unstable; urgency=low
+
+  * New release 0.4.0
+  * Rebuild with source format 3.0, dh_python2
+  * Split off -dev package
+  * Adjusted description texts
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de>  Thu, 13 Dec 2012 11:10:00 +0100
+
 gstlal-ugly (0.3.1-1) unstable; urgency=low
 
   * New upstream release
@@ -16,3 +25,4 @@ gstlal-ugly (0.2.0-1) squeeze; urgency=low
   * Initial release.
 
  -- Carsten Aulbert <carsten.aulbert@aei.mpg.de>  Mon, 16 Apr 2012 13:50:55 +0200
+
diff --git a/gstlal-ugly/debian/control b/gstlal-ugly/debian/control
index 3d794d84db..2db9d54d63 100644
--- a/gstlal-ugly/debian/control
+++ b/gstlal-ugly/debian/control
@@ -3,12 +3,14 @@ Maintainer: Carsten Aulbert <carsten.aulbert@aei.mpg.de>
 Section: lscsoft
 Priority: optional
 Standards-Version: 3.9.2
+X-Python-Version: >= 2.6
 Build-Depends:
  debhelper (>= 8),
- python-dev (>= 2.6),
+ python-all-dev (>= 2.6),
  libfftw3-dev (>= 3),
- gstlal-dep (>= 0.2.2),
+ gstlal-dep (>= 2.2) | gstenvironment,
  python-gobject-dev,
+ python-numpy,
  lal-dev (>= 6.7.0),
  lalframe-dev (>= 1.0.5),
  lalmetaio-dev (>= 1.0.4),
@@ -18,25 +20,25 @@ Build-Depends:
  libgsl0-dev (>= 1.9),
  ldas-tools-framecpp-dev (>= 1.19.24),
  gds-dev (>= 2.15.6),
+ gds-crtools,
+ python-glue (>= 1.42),
  nds2-client-dev,
- cyrus-sasl-dev,
  fakeroot,
- autoconf,
  pkg-config,
  libxml2-dev,
  liborc-0.4-0 (>= 1:0.4.16),
  liborc-0.4-dev (>= 1:0.4.16),
- gstlal-dev (>=0.5.0)
+ gstlal-dev (>= 0.5.0)
 
 Package: gstlal-ugly
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python (>= 2.6),
  python-glue (>= 1.42),
  python-glue-segments (>= 1.42),
  python-pylal (>= 0.1.4),
  libfftw3-3,
- gstlal-dep (>= 0.2.2),
+ gstlal-dep (>= 2.2) | gstenvironment,
  python-gobject,
  python-numpy,
  lal (>= 6.7.0),
@@ -49,15 +51,35 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ldas-tools-framecpp (>= 1.19.24),
  gds-core (>= 2.15.6),
  gds-crtools (>= 2.15.6),
- cyrus-sasl-lib,
  nds2-client,
  liborc-0.4-0 (>= 1:0.4.16),
  libxml2,
- gstlal (>=0.5.0)
-Description: GStreamer version of LAL (ugly part)
- gstlal provides a suite of GStreamer elements that expose
- gravitational-wave data analysis tools from the LAL library for use
- in GStreamer signal-processing pipelines. Examples include an element
- to add simulated gravitational waves to an h(t) stream, and source
- elements that can provide data from .gwf frame files or NDS
- servers to a GStreamer pipeline.
+ gstlal (>= 0.5.0~)
+Description: GStreamer for GW data analysis (in-development parts)
+ This package provides a variety of GStreamer elements for
+ gravitational-wave data analysis and some libraries to help write such
+ elements. The code here sits on top of several other libraries, notably
+ the LIGO Algorithm Library (LAL), FFTW, the GNU Scientific Library (GSL),
+ and, of course, GStreamer.
+ This package contains the plugins and shared libraries required to run
+ gstlal-based applications.
+
+Package: gstlal-ugly-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+ gstlal-ugly (= ${binary:Version}),
+ gstlal-dev (>= 0.5.0~),
+ libfftw3-dev,
+ libgsl0-dev,
+ libreadline-dev,
+ python-gobject-dev,
+ lal-dev (>= 6.7.0),
+ lalframe-dev (>= 1.0.5),
+ lalmetaio-dev (>= 1.0.4),
+ lalburst-dev (>= 1.1.2),
+ lalinspiral-dev (>= 1.3.0),
+ gds-dev, gds-crtools,
+ nds2-client-dev
+Description: Files and documentation needed for compiling gstlal-ugly based plugins and programs.
+ This package contains the files needed for building gstlal-ugly based
+ plugins ands programs.
diff --git a/gstlal-ugly/debian/copyright b/gstlal-ugly/debian/copyright
index e69de29bb2..5852795b4d 100644
--- a/gstlal-ugly/debian/copyright
+++ b/gstlal-ugly/debian/copyright
@@ -0,0 +1 @@
+License: GPL
diff --git a/gstlal-ugly/debian/gstlal-ugly-dev.install b/gstlal-ugly/debian/gstlal-ugly-dev.install
new file mode 100644
index 0000000000..29d6028b3f
--- /dev/null
+++ b/gstlal-ugly/debian/gstlal-ugly-dev.install
@@ -0,0 +1,5 @@
+usr/lib/*a
+usr/lib/*.so
+usr/lib/pkgconfig/*
+usr/lib/gstreamer-*/*a
+usr/include/*
diff --git a/gstlal-ugly/debian/gstlal-ugly.install b/gstlal-ugly/debian/gstlal-ugly.install
new file mode 100644
index 0000000000..293164208a
--- /dev/null
+++ b/gstlal-ugly/debian/gstlal-ugly.install
@@ -0,0 +1,5 @@
+usr/bin/*
+usr/lib/*.so.*
+usr/lib/gstreamer-*/*.so*
+usr/lib/gstreamer-*/python/*
+usr/lib/python*/*/gstlal
diff --git a/gstlal-ugly/debian/rules b/gstlal-ugly/debian/rules
index 781a8ec1cc..9612ea7ad5 100755
--- a/gstlal-ugly/debian/rules
+++ b/gstlal-ugly/debian/rules
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 %:
-	. /opt/lscsoft/gst/etc/gstlal.sh; dh $@
+	. /opt/lscsoft/gst/etc/gstenvironment.sh; \
+	dh $@ --with=python2
 
 override_dh_auto_test:
-	. /opt/lscsoft/gst/etc/gstlal.sh; export PYTHONPATH=$$(pwd)/python; dh $@
+	. /opt/lscsoft/gst/etc/gstenvironment.sh; \
+	export PYTHONPATH=$$(pwd)/python; \
+	dh $@
 
 override_dh_shlibdeps:
-	. /opt/lscsoft/gst/etc/gstlal.sh; dh "$@" -Xlibgstaudio-0.10.so.0
+	. /opt/lscsoft/gst/etc/gstenvironment.sh; \
+	dh "$@" -Xlibgstaudio-0.10.so.0
diff --git a/gstlal-ugly/debian/source/format b/gstlal-ugly/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/gstlal-ugly/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/gstlal/debian/changelog b/gstlal/debian/changelog
index 2976075f5e..8720771d2c 100644
--- a/gstlal/debian/changelog
+++ b/gstlal/debian/changelog
@@ -1,3 +1,12 @@
+gstlal (0.5.0~beta0-3) unstable; urgency=low
+
+  * New version 0.5.0
+  * Rebuild with source format 3.0, dh_python2
+  * Split off -dev package
+  * Adjusted description texts
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de>  Thu, 13 Dec 2012 10:15:00 +0100
+
 gstlal (0.4.2-2) unstable; urgency=low
 
   * fix control file
@@ -28,3 +37,4 @@ gstlal (0.2.0-1) UNRELEASED; urgency=low
   * Initial release.
 
  -- Carsten Aulbert <carsten.aulbert@aei.mpg.de>  Wed, 11 Apr 2012 13:50:09 +0200
+
diff --git a/gstlal/debian/control b/gstlal/debian/control
index 2dde79a2dc..bdaa537519 100644
--- a/gstlal/debian/control
+++ b/gstlal/debian/control
@@ -3,13 +3,14 @@ Maintainer: Carsten Aulbert <carsten.aulbert@aei.mpg.de>
 Section: lscsoft
 Priority: optional
 Standards-Version: 3.9.2
+X-Python-Version: >= 2.6
 Build-Depends:
  debhelper (>= 8),
- python-dev (>= 2.6),
+ python-all-dev (>= 2.6),
  liborc-0.4-dev (>= 1:0.4.16),
  liborc-0.4-0 (>= 1:0.4.16),
  libfftw3-dev (>= 3),
- gstlal-dep (>= 0.2.2),
+ gstlal-dep (>= 2.2) | gstenvironment,
  python-gobject-dev,
  lal-dev (>= 6.7.0),
  lalframe-dev (>= 1.0.5),
@@ -19,20 +20,19 @@ Build-Depends:
  lalinspiral-dev (>= 1.3.0),
  libgsl0-dev (>= 1.9),
  fakeroot,
- autoconf,
  pkg-config,
  libxml2-dev
 
 Package: gstlal
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python (>= 2.6),
  python-glue (>= 1.42),
  python-glue-segments (>= 1.42),
  python-pylal (>= 0.1.4),
  libfftw3-3,
  liborc-0.4-0 (>= 1:0.4.16),
- gstlal-dep (>= 0.2.2),
+ gstlal-dep (>= 2.2) | gstenvironment,
  python-gobject,
  python-numpy,
  lal (>= 6.7.0),
@@ -43,11 +43,32 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  lalinspiral (>= 1.3.0),
  libgsl0 (>= 1.9),
  libxml2
-Description: GStreamer version of LAL
- gstlal provides a suite of GStreamer elements that expose
- gravitational-wave data analysis tools from the LAL library for use
- in GStreamer signal-processing pipelines. Examples include an element
- to add simulated gravitational waves to an h(t) stream, and a source
- element to provide the contents of .gwf frame files to a GStreamer
- pipeline.
+Description: GStreamer for GW data analysis (core stable parts)
+ This package provides a variety of GStreamer elements for
+ gravitational-wave data analysis and some libraries to help write such
+ elements.  The code here sits on top of several other libraries, notably
+ the LIGO Algorithm Library (LAL), FFTW, the GNU scientific Library (GSL),
+ and, of course, GStreamer.
+ This package contains the plugins and shared libraries required to run
+ gstlal-based applications.
 
+Package: gstlal-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ gstlal (= ${binary:Version}),
+ python-all-dev (>= 2.6),
+ libfftw3-dev (>= 3),
+ libgsl0-dev (>= 1.9),
+ liborc-0.4-dev (>= 1:0.4.16),
+ liborc-0.4-0 (>=1:0.4.16),
+ gstlal-dep (>= 2.2) | gstenvironment,
+ python-gobject-dev,
+ lal-dev (>= 6.7.0),
+ lalframe-dev (>= 1.0.5),
+ lalmetaio-dev (>= 1.0.4),
+ lalsimulation-dev (>= 0.4.0),
+ lalburst-dev (>= 1.1.2),
+ lalinspiral-dev (>= 1.3.0)
+Description: Files and documentation needed for compiling gstlal based plugins and programs.
+ This package contains the files needed for building gstlal-based plugins
+ and programs.
diff --git a/gstlal/debian/copyright b/gstlal/debian/copyright
index e69de29bb2..5852795b4d 100644
--- a/gstlal/debian/copyright
+++ b/gstlal/debian/copyright
@@ -0,0 +1 @@
+License: GPL
diff --git a/gstlal/debian/gstlal-dev.install b/gstlal/debian/gstlal-dev.install
new file mode 100644
index 0000000000..15e69aacbf
--- /dev/null
+++ b/gstlal/debian/gstlal-dev.install
@@ -0,0 +1,5 @@
+usr/lib/*a
+usr/lib/*.so
+usr/lib/pkgconfig
+usr/lib/gstreamer-*/*a
+usr/include
diff --git a/gstlal/debian/gstlal.install b/gstlal/debian/gstlal.install
new file mode 100644
index 0000000000..aeeac0cc4e
--- /dev/null
+++ b/gstlal/debian/gstlal.install
@@ -0,0 +1,5 @@
+usr/bin/*
+usr/lib/*.so.*
+usr/lib/gstreamer-*/*.so*
+usr/lib/gstreamer-*/python*/*
+usr/lib/python*/*/gstlal
diff --git a/gstlal/debian/rules b/gstlal/debian/rules
index 3f2701338f..7906db3c91 100755
--- a/gstlal/debian/rules
+++ b/gstlal/debian/rules
@@ -1,9 +1,17 @@
 #!/usr/bin/make -f
 %:
-	. /opt/lscsoft/gst/etc/gstenvironment.sh; dh $@
+	. /opt/lscsoft/gst/etc/gstenvironment.sh; \
+	dh $@ --with=python2
+
+override_dh_auto_install:
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	ls -lR $(CURDIR)/debian/tmp
 
 override_dh_auto_test:
-	. /opt/lscsoft/gst/etc/gstenvironment.sh; export PYTHONPATH=$$(pwd)/python; dh $@
+	. /opt/lscsoft/gst/etc/gstenvironment.sh; \
+	export PYTHONPATH=$$(pwd)/python; \
+	dh $@
 
 override_dh_shlibdeps:
-	. /opt/lscsoft/gst/etc/gstenvironment.sh; dh "$@" -Xlibgstaudio-0.10.so.0
+	. /opt/lscsoft/gst/etc/gstenvironment.sh; \
+	dh "$@" -Xlibgstaudio-0.10.so.0
diff --git a/gstlal/debian/source/format b/gstlal/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/gstlal/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
-- 
GitLab