From be01a24e3b7885ad794f40b58b24749f7c7fa5ee Mon Sep 17 00:00:00 2001
From: Steffen Grunewald <steffen.grunewald@aei.mpg.de>
Date: Tue, 9 Jun 2009 12:12:36 +0200
Subject: [PATCH] debian/ for lal

---
 lal/debian/changelog       |  6 ++++++
 lal/debian/control         |  6 +++---
 lal/debian/lal-dev.dirs    |  6 ++++--
 lal/debian/lal-dev.install |  8 ++++++++
 lal/debian/lal.dirs        |  5 +++++
 lal/debian/lal.install     |  5 +++++
 lal/debian/rules           | 18 +++++++++---------
 lalapps/debian/changelog   |  6 ++++++
 lalapps/debian/control     |  4 ++--
 lalapps/debian/dirs        |  6 ++++--
 lalapps/debian/docs        |  2 ++
 lalapps/debian/rules       |  2 +-
 12 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 lal/debian/lal-dev.install
 create mode 100644 lal/debian/lal.dirs
 create mode 100644 lal/debian/lal.install

diff --git a/lal/debian/changelog b/lal/debian/changelog
index 5a06362416..d78de0b63c 100644
--- a/lal/debian/changelog
+++ b/lal/debian/changelog
@@ -1,3 +1,9 @@
+lal (6.0-1lscsoft1) unstable; urgency=low
+
+  * LAL 6.0 (based on branch 9d93e994822c8dc61f2a62233e017d71866564f9)
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de>  Tue, 09 Jun 2009 11:30:00 +0200
+
 lal (5.3-1lscsoft1) unstable; urgency=low
 
   * LAL 5.3 for Metaio 8.2
diff --git a/lal/debian/control b/lal/debian/control
index bdb09f9e81..400a9afc88 100644
--- a/lal/debian/control
+++ b/lal/debian/control
@@ -2,12 +2,12 @@ Source: lal
 Section: lscsoft
 Priority: optional
 Maintainer: Steffen Grunewald <steffen.grunewald@aei.mpg.de>
-Build-Depends: debhelper (>= 5), autotools-dev, automake, m4, libgsl0-dev (>= 1.9), libframe-dev, libmetaio-dev (>= 8.2), fftw3-dev, zlib1g-dev, libxml2-dev (>= 2.6), pkg-config, python2.4-dev, python2.5-dev, git-core
+Build-Depends: debhelper (>= 5), autotools-dev, automake, m4, libgsl0-dev (>= 1.9), libframe-dev (>= 8.0), libmetaio-dev (>= 8.2), fftw3-dev, zlib1g-dev, libxml2-dev (>= 2.6), libcfitsio3-dev, git-core (>= 1.5), pkg-config, python2.4-dev, python2.5-dev
 Standards-Version: 3.7.2
 
 Package: lal
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0 (>= 1.9) | libgsl0ldbl (>= 1.10), libframe1, libmetaio1 (>= 8.2), fftw3, zlib1g, libxml2 (>= 2.6), python2.4
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0 (>= 1.9) | libgsl0ldbl (>= 1.10), libframe1 (>= 8.0), libmetaio1 (>= 8.2), fftw3, zlib1g, libxml2 (>= 2.6), python2.4
 Description: LSC Algorithm Library
  The LSC Algorithm Library for gravitational wave analysis.
  This package contains the shared-object libraries needed to run applications
@@ -15,7 +15,7 @@ Description: LSC Algorithm Library
 
 Package: lal-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0-dev (>= 1.9), libframe-dev, libmetaio-dev (>= 8.2), fftw3-dev, zlib1g-dev, libxml2-dev (>= 2.6), python2.4
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0-dev (>= 1.9), libframe-dev (>= 8.0), libmetaio-dev (>= 8.2), fftw3-dev, zlib1g-dev, libxml2-dev (>= 2.6), python2.4
 Description: Files and documentation needed for compiling programs that use LAL
  The LSC Algorithm Library for gravitational wave analysis.
  This package contains files needed to build applications that use the LAL library
diff --git a/lal/debian/lal-dev.dirs b/lal/debian/lal-dev.dirs
index 538088eeac..6513e37741 100644
--- a/lal/debian/lal-dev.dirs
+++ b/lal/debian/lal-dev.dirs
@@ -1,4 +1,6 @@
 opt/lscsoft/lal/bin
 opt/lscsoft/lal/include
-opt/lscsoft/lal/lib
-opt/lscsoft/lal/share
+opt/lscsoft/lal/lib/pkgconfig
+opt/lscsoft/lal/share/lal
+opt/lscsoft/lal/share/man/man1
+opt/lscsoft/lal/share/man/man3
diff --git a/lal/debian/lal-dev.install b/lal/debian/lal-dev.install
new file mode 100644
index 0000000000..49a4998f3f
--- /dev/null
+++ b/lal/debian/lal-dev.install
@@ -0,0 +1,8 @@
+opt/lscsoft/lal/bin/lal-config
+opt/lscsoft/lal/include/lal*
+opt/lscsoft/lal/lib/*a
+opt/lscsoft/lal/lib/pkgconfig
+opt/lscsoft/lal/sbin/uninstall-lal.sh
+opt/lscsoft/lal/share/man/man1/lal-config.1*
+opt/lscsoft/lal/share/man/man3/lal.3*
+#opt/lscsoft/lal/datadir
diff --git a/lal/debian/lal.dirs b/lal/debian/lal.dirs
new file mode 100644
index 0000000000..585dd8a388
--- /dev/null
+++ b/lal/debian/lal.dirs
@@ -0,0 +1,5 @@
+opt/lscsoft/lal/bin
+opt/lscsoft/lal/etc
+opt/lscsoft/lal/lib
+opt/lscsoft/lal/sbin
+opt/lscsoft/lal/share
diff --git a/lal/debian/lal.install b/lal/debian/lal.install
new file mode 100644
index 0000000000..00a7126c51
--- /dev/null
+++ b/lal/debian/lal.install
@@ -0,0 +1,5 @@
+opt/lscsoft/lal/bin/lal-version
+opt/lscsoft/lal/etc/*-user-env.*
+opt/lscsoft/lal/lib/*.so*
+opt/lscsoft/lal/sbin/uninstall-*.sh
+opt/lscsoft/lal/share/lal
diff --git a/lal/debian/rules b/lal/debian/rules
index e6689fd062..6c93dd89e6 100755
--- a/lal/debian/rules
+++ b/lal/debian/rules
@@ -75,18 +75,18 @@ install : build
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/lal install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 	# split off -dev
 #	mkdir -p $(CURDIR)/debian/lal-dev/$(PREFIX)/bin $(CURDIR)/debian/lal-dev/$(PREFIX)/lib $(CURDIR)/debian/lal-dev/$(PREFIX)/include
-	mv $(CURDIR)/debian/lal/$(PREFIX)/bin/lal-config $(CURDIR)/debian/lal-dev/$(PREFIX)/bin/
-	mv $(CURDIR)/debian/lal/$(PREFIX)/lib/*a $(CURDIR)/debian/lal-dev/$(PREFIX)/lib/
-	mv $(CURDIR)/debian/lal/$(PREFIX)/lib/pkgconfig $(CURDIR)/debian/lal-dev/$(PREFIX)/lib/
-	mv $(CURDIR)/debian/lal/$(PREFIX)/include/* $(CURDIR)/debian/lal-dev/$(PREFIX)/include/
-	mv $(CURDIR)/debian/lal/$(PREFIX)/share/lal $(CURDIR)/debian/lal-dev/$(PREFIX)/share/
-	mv $(CURDIR)/debian/lal/$(PREFIX)/share/man* $(CURDIR)/debian/lal-dev/$(PREFIX)/share/
+##	mv $(CURDIR)/debian/lal/$(PREFIX)/bin/lal-config $(CURDIR)/debian/lal-dev/$(PREFIX)/bin/
+##	mv $(CURDIR)/debian/lal/$(PREFIX)/lib/*a $(CURDIR)/debian/lal-dev/$(PREFIX)/lib/
+##	mv $(CURDIR)/debian/lal/$(PREFIX)/lib/pkgconfig $(CURDIR)/debian/lal-dev/$(PREFIX)/lib/
+##	mv $(CURDIR)/debian/lal/$(PREFIX)/include/* $(CURDIR)/debian/lal-dev/$(PREFIX)/include/
+##	mv $(CURDIR)/debian/lal/$(PREFIX)/share/lal $(CURDIR)/debian/lal-dev/$(PREFIX)/share/
+##	mv $(CURDIR)/debian/lal/$(PREFIX)/share/man* $(CURDIR)/debian/lal-dev/$(PREFIX)/share/
 
-	dh_install -s
+	dh_install --sourcedir=debian/tmp
 
 
 binary-common :
@@ -102,7 +102,7 @@ binary-common :
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
-#	dh_python
+	dh_python
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
diff --git a/lalapps/debian/changelog b/lalapps/debian/changelog
index 7118a57c94..ba97d72180 100644
--- a/lalapps/debian/changelog
+++ b/lalapps/debian/changelog
@@ -1,3 +1,9 @@
+lalapps (6.0-1lscsoft1) unstable; urgency=low
+
+  * LALapps 6.0 (based on branch 9d93e994822c8dc61f2a62233e017d71866564f9)
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de>  Tue, 09 Jun 2009 11:30:00 +0200
+
 lalapps (5.3-1lscsoft1) unstable; urgency=low
 
   * 5.3 release for Metaio 8.2
diff --git a/lalapps/debian/control b/lalapps/debian/control
index edb00c1d65..20c91e37fc 100644
--- a/lalapps/debian/control
+++ b/lalapps/debian/control
@@ -2,12 +2,12 @@ Source: lalapps
 Section: lscsoft
 Priority: optional
 Maintainer: Steffen Grunewald <steffen.grunewald@aei.mpg.de>
-Build-Depends: debhelper (>= 5), autotools-dev, automake, m4, libgsl0-dev (>= 1.9), libframe-dev, libmetaio-dev (>= 8.2), fftw3-dev, libcfitsio3-dev, lal-dev (>= 5.3), lal (>= 5.3), zlib1g-dev, libxml2-dev (>= 2.6), pkg-config, python2.4-dev, python2.5-dev
+Build-Depends: debhelper (>= 5), autotools-dev, automake, m4, libgsl0-dev (>= 1.9), libframe-dev (>= 8.0), libmetaio-dev (>= 8.2), fftw3-dev, zlib1g-dev, libxml2-dev (>= 2.6), libcfitsio3-dev, git-core (>= 1.5), lal-dev (>= 6.0), lal (>= 6.0), pkg-config, python2.4-dev, python2.5-dev
 Standards-Version: 3.7.2
 
 Package: lalapps
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zlib1g, libgsl0 (>= 1.9) | libgsl0ldbl (>= 1.9), libframe1, libmetaio1 (>=8.2), fftw3, libcfitsio3, lal (>= 5.3), libxml2 (>= 2.6), python2.4
+Depends: ${shlibs:Depends}, ${misc:Depends}, zlib1g, libgsl0 (>= 1.9) | libgsl0ldbl (>= 1.10), libframe1 (>= 8.0), libmetaio1 (>=8.2), fftw3, libcfitsio3, lal (>= 6.0), libxml2 (>= 2.6), python2.4
 Recommends: python2.5
 Description: LSC Algorithm Library Applications
  The LSC Algorithm Library Applications for gravitational wave data analysis.
diff --git a/lalapps/debian/dirs b/lalapps/debian/dirs
index 84458004e8..e1852c4a6c 100644
--- a/lalapps/debian/dirs
+++ b/lalapps/debian/dirs
@@ -1,4 +1,6 @@
 opt/lscsoft/lalapps/bin
-opt/lscsoft/lalapps/sbin
 opt/lscsoft/lalapps/etc
-opt/lscsoft/lalapps/share
+opt/lscsoft/lalapps/lib
+opt/lscsoft/lalapps/sbin
+opt/lscsoft/lalapps/share/lalapps
+opt/lscsoft/lalapps/share/man
diff --git a/lalapps/debian/docs b/lalapps/debian/docs
index 50bd824bb7..eb690e3f19 100644
--- a/lalapps/debian/docs
+++ b/lalapps/debian/docs
@@ -1,2 +1,4 @@
 NEWS
 README
+README.bugs
+README.contrib
diff --git a/lalapps/debian/rules b/lalapps/debian/rules
index d7a0900bf2..d6341e7f25 100755
--- a/lalapps/debian/rules
+++ b/lalapps/debian/rules
@@ -121,7 +121,7 @@ binary-common: build install
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
-#	dh_python
+	dh_python
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-- 
GitLab