From 7b8c8a64bed5734e32cc0b6786103a06895f60e3 Mon Sep 17 00:00:00 2001
From: steffeng <steffeng>
Date: Mon, 10 Nov 2008 07:50:28 +0000
Subject: [PATCH] install to /opt/lscsoft
---
lal/debian/changelog | 30 +++++++++++++++++++++++++++
lal/debian/control | 6 +++---
lal/debian/dirs | 4 ++++
lal/debian/lal-dev.dirs | 6 ++++--
lal/debian/lal-dev.install | 5 -----
lal/debian/lal.install | 2 --
lal/debian/postinst | 42 --------------------------------------
lal/debian/postrm | 39 -----------------------------------
lal/debian/rules | 32 ++++++++++++++---------------
lalapps/debian/changelog | 30 +++++++++++++++++++++++++++
lalapps/debian/dirs | 4 ++++
lalapps/debian/rules | 14 +++++--------
12 files changed, 95 insertions(+), 119 deletions(-)
create mode 100644 lal/debian/dirs
delete mode 100644 lal/debian/lal-dev.install
delete mode 100644 lal/debian/lal.install
delete mode 100644 lal/debian/postinst
delete mode 100644 lal/debian/postrm
create mode 100644 lalapps/debian/dirs
diff --git a/lal/debian/changelog b/lal/debian/changelog
index c344c74e40..5e242443b0 100644
--- a/lal/debian/changelog
+++ b/lal/debian/changelog
@@ -1,3 +1,33 @@
+lal (5.2-7lscsoft2) unstable; urgency=low
+
+ * prefix=/opt/lscsoft/lal, some more fixes
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Wed, 05 Nov 2008 11:00:00 +0100
+
+lal (5.2-7lscsoft1) unstable; urgency=low
+
+ * prefix=/opt/lscsoft/lal
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Tue, 04 Nov 2008 12:00:00 +0100
+
+lal (5.2-6) unstable; urgency=low
+
+ * /etc/lal just in case
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Fri, 29 Feb 2008 10:00:00 +0100
+
+lal (5.2-5) unstable; urgency=low
+
+ * reorder package contents, move etc/ to etc/lscsoft/
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Thu, 28 Feb 2008 14:45:00 +0100
+
+lal (5.2-4) unstable; urgency=low
+
+ * fixed build dependencies
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Thu, 21 Feb 2008 13:55:00 +0100
+
lal (5.2-3) unstable; urgency=low
* rebuilt with --enable-frame --enable-metaio
diff --git a/lal/debian/control b/lal/debian/control
index 6689607463..6303cda12c 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 (<= 7.9), fftw3-dev, zlib1g-dev
+Build-Depends: debhelper (>= 5), autotools-dev, automake, m4, libgsl0-dev (>= 1.9), libframe-dev, libmetaio-dev (>= 7.2), fftw3-dev, zlib1g-dev
Standards-Version: 3.7.2
Package: lal
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0 (>= 1.9), libframe0, libmetaio0 (<= 7.9), fftw3, zlib1g
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0 (>= 1.9) | libgsl0ldbl (>= 1.10), libframe0, libmetaio0 (>= 7.2), fftw3, zlib1g
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 (<= 7.9), fftw3-dev, zlib1g-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgsl0-dev (>= 1.9), libframe-dev, libmetaio-dev (>= 7.2), fftw3-dev, zlib1g-dev
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/dirs b/lal/debian/dirs
new file mode 100644
index 0000000000..3d26b4eb0a
--- /dev/null
+++ b/lal/debian/dirs
@@ -0,0 +1,4 @@
+opt/lscsoft/lal/bin
+opt/lscsoft/lal/sbin
+opt/lscsoft/lal/share/lal
+opt/lscsoft/lal/etc
diff --git a/lal/debian/lal-dev.dirs b/lal/debian/lal-dev.dirs
index da07fddd09..538088eeac 100644
--- a/lal/debian/lal-dev.dirs
+++ b/lal/debian/lal-dev.dirs
@@ -1,2 +1,4 @@
-usr/include
-usr/lib
+opt/lscsoft/lal/bin
+opt/lscsoft/lal/include
+opt/lscsoft/lal/lib
+opt/lscsoft/lal/share
diff --git a/lal/debian/lal-dev.install b/lal/debian/lal-dev.install
deleted file mode 100644
index a26b5c76f2..0000000000
--- a/lal/debian/lal-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/lal-config
-usr/include
-usr/lib/*a
-usr/lib/pkgconfig
-usr/share
diff --git a/lal/debian/lal.install b/lal/debian/lal.install
deleted file mode 100644
index 8151659b64..0000000000
--- a/lal/debian/lal.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/lal-version
-usr/lib/*.so*
diff --git a/lal/debian/postinst b/lal/debian/postinst
deleted file mode 100644
index 40604f6c39..0000000000
--- a/lal/debian/postinst
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# postinst script for lal
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
- configure)
- ldconfig
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/lal/debian/postrm b/lal/debian/postrm
deleted file mode 100644
index cfab54a72b..0000000000
--- a/lal/debian/postrm
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# postrm script for lal
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- remove)
- ldconfig
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/lal/debian/rules b/lal/debian/rules
index bcf775a173..2a49c23f7d 100755
--- a/lal/debian/rules
+++ b/lal/debian/rules
@@ -12,6 +12,8 @@ export DH_OPTIONS
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+PREFIX = /opt/lscsoft/lal
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -24,20 +26,16 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-PREFIX = /usr
-SYSCONF = /etc/lal
configure:
sh ./00boot
config.status : configure
dh_testdir
-# ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-gcc-flags
# LDFLAGS="-Wl,-z,defs"
CFLAGS="$(CFLAGS)" \
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=$(PREFIX) \
- --sysconfdir=$(SYSCONF) \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--enable-nightly=no \
--enable-frame --enable-metaio \
@@ -81,19 +79,18 @@ install : build
dh_installdirs
# Add here commands to install the package into debian/lal.
-# $(MAKE) DESTDIR=$(CURDIR)/debian/lal install
- # dh_install reads debian/*.install for instructions
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_install --sourcedir=debian/tmp
+ $(MAKE) DESTDIR=$(CURDIR)/debian/lal install
-# remove unneeded /etc/lal
-# -rm -rf $(CURDIR)/debian/lal/etc
-
# split off -dev
- -mv $(CURDIR)/debian/lal/$(PREFIX)/include/* $(CURDIR)/debian/lal-dev/$(PREFIX)/include
- -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
-# dh_install -s
+ 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/
+
+ dh_install -s
# Must not depend on anything. This is to be called by
@@ -101,7 +98,7 @@ install : build
binary-common :
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
# dh_install
@@ -127,8 +124,9 @@ binary-common :
dh_gencontrol
dh_md5sums
dh_builddeb
+
# Build architecture dependant packages using the common target.
binary : install
$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-.PHONY: build clean install binary
+.PHONY: build clean binary install
diff --git a/lalapps/debian/changelog b/lalapps/debian/changelog
index 3b892b4764..89923b5c9b 100644
--- a/lalapps/debian/changelog
+++ b/lalapps/debian/changelog
@@ -1,3 +1,33 @@
+lalapps (5.2-7lscsoft2) unstable; urgency=low
+
+ * prefix=/opt/lscsoft/lalapps, some fixes
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Wed, 05 Nov 2008 11:30:00 +0100
+
+lalapps (5.2-7lscsoft1) unstable; urgency=low
+
+ * prefix=/opt/lscsoft/lalapps
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Tue, 04 Nov 2008 12:00:00 +0100
+
+lalapps (5.2-6) unstable; urgency=low
+
+ * /etc/lalapps just in case
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Fri, 29 Feb 2008 10:00:00 +0100
+
+lalapps (5.2-5) unstable; urgency=low
+
+ * moved etc/ to etc/lscsoft/
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Thu, 28 Feb 2008 14:45:00 +0100
+
+lalapps (5.2-4) unstable; urgency=low
+
+ * fixed zlib1g build dependency
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Thu, 21 Feb 2008 14:20:00 +0100
+
lalapps (5.2-3) unstable; urgency=low
* Use --enable-frame --enable-metaio
diff --git a/lalapps/debian/dirs b/lalapps/debian/dirs
new file mode 100644
index 0000000000..84458004e8
--- /dev/null
+++ b/lalapps/debian/dirs
@@ -0,0 +1,4 @@
+opt/lscsoft/lalapps/bin
+opt/lscsoft/lalapps/sbin
+opt/lscsoft/lalapps/etc
+opt/lscsoft/lalapps/share
diff --git a/lalapps/debian/rules b/lalapps/debian/rules
index 9e520f03da..ef03b11706 100755
--- a/lalapps/debian/rules
+++ b/lalapps/debian/rules
@@ -15,8 +15,8 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-PREFIX = /usr
-SYSCONF = /etc/lalapps
+PREFIX = /opt/lscsoft/lalapps
+LALPREFIX = /opt/lscsoft/lal
CFLAGS = -Wall -g
@@ -31,15 +31,15 @@ configure:
config.status: configure
dh_testdir
- # Add here commands to configure the package.
-#LDFLAGS="-Wl,-z,defs"
+
+# LDFLAGS="-Wl,-z,defs"
CFLAGS="$(CFLAGS)" \
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=$(PREFIX) \
- --sysconfdir=$(SYSCONF) \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--enable-nightly=no \
--enable-frame --enable-metaio \
+ --with-lal-prefix=$(LALPREFIX) \
--disable-debug
build: build-stamp
@@ -47,7 +47,6 @@ build: build-stamp
build-stamp: config.status
dh_testdir
- # Add here commands to compile the package.
$(MAKE)
touch $@
@@ -77,9 +76,6 @@ install: build
# Add here commands to install the package into debian/lalapps.
$(MAKE) DESTDIR=$(CURDIR)/debian/lalapps install
-# remove unneeded /etc/lalapps
-# -rm -rf $(CURDIR)/debian/lalapps/etc
-
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
--
GitLab