diff --git a/lalapps/debian/changelog b/lalapps/debian/changelog
index 169d0ce992c42914fb335afa9fd0a04298b8c3c3..d37dddc9d8813ba2565773f6f6dae15b07d8d52a 100644
--- a/lalapps/debian/changelog
+++ b/lalapps/debian/changelog
@@ -1,3 +1,9 @@
+lalapps (6.2-1lscsoft2) unstable; urgency=low
+
+ * LALApps 6.2 with dynamic python version fix
+
+ -- Steffen Grunewald <steffen.grunewald@aei.mpg.de> Mon, 10 Aug 2009 14:07:00 +0200
+
lalapps (6.2-1lscsoft1) unstable; urgency=low
* LALApps 6.2
diff --git a/lalapps/debian/control b/lalapps/debian/control
index 20c91e37fc902111417211363c5e9efcd5cf8070..f63f034095114199f52c2b7babb127bd24c89cbc 100644
--- a/lalapps/debian/control
+++ b/lalapps/debian/control
@@ -2,13 +2,13 @@ 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 (>= 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
+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, python-dev (>= 2.4)
Standards-Version: 3.7.2
Package: lalapps
Architecture: any
-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
+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), python (>= 2.4)
+Recommends: python2.4, python2.5
Description: LSC Algorithm Library Applications
The LSC Algorithm Library Applications for gravitational wave data analysis.
This package contains applications that are built on tools in the
diff --git a/lalapps/debian/dirs b/lalapps/debian/dirs
index e1852c4a6cfea53a6fdc303e2e7c9380f755878c..c0229364751c52bb899b706f619eac5cf9d256ec 100644
--- a/lalapps/debian/dirs
+++ b/lalapps/debian/dirs
@@ -1,6 +1,7 @@
opt/lscsoft/lalapps/bin
opt/lscsoft/lalapps/etc
-opt/lscsoft/lalapps/lib
+opt/lscsoft/lalapps/lib/python2.4
+opt/lscsoft/lalapps/lib/python2.5
opt/lscsoft/lalapps/sbin
opt/lscsoft/lalapps/share/lalapps
opt/lscsoft/lalapps/share/man
diff --git a/lalapps/debian/lalapps-user-env.csh b/lalapps/debian/lalapps-user-env.csh
new file mode 100644
index 0000000000000000000000000000000000000000..4ab6ecbf03f6cc9c3e718b95970174b76de5934f
--- /dev/null
+++ b/lalapps/debian/lalapps-user-env.csh
@@ -0,0 +1,13 @@
+# Source this file to access LALApps
+setenv PATH "/opt/lscsoft/lalapps/bin:${PATH}"
+setenv PYSITE_PATH python`python -V 2>&1 | cut -d' ' -f2 | cut -d. -f-2`
+if ( $?MANPATH ) then
+ setenv MANPATH "/opt/lscsoft/lalapps/share/man:${MANPATH}"
+else
+ setenv MANPATH "/opt/lscsoft/lalapps/share/man"
+endif
+if ( $?PYTHONPATH ) then
+ setenv PYTHONPATH "/opt/lscsoft/lalapps/lib/${PYSITE_PATH}/site-packages:${PYTHONPATH}"
+else
+ setenv PYTHONPATH "/opt/lscsoft/lalapps/lib/${PYSITE_PATH}/site-packages"
+endif
diff --git a/lalapps/debian/lalapps-user-env.sh b/lalapps/debian/lalapps-user-env.sh
new file mode 100644
index 0000000000000000000000000000000000000000..087d3ce85aa8bdf159cb07f91866e25ff4409f84
--- /dev/null
+++ b/lalapps/debian/lalapps-user-env.sh
@@ -0,0 +1,6 @@
+# Source this file to access LALApps
+PATH="/opt/lscsoft/lalapps/bin:${PATH}"
+MANPATH="/opt/lscsoft/lalapps/share/man:${MANPATH}"
+PYSITE_PATH=python`python -V 2>&1 | cut -d' ' -f2 | cut -d. -f-2`
+PYTHONPATH="/opt/lscsoft/lalapps/lib/${PYSITE_PATH}/site-packages:${PYTHONPATH}"
+export PATH MANPATH PYTHONPATH
diff --git a/lalapps/debian/rules b/lalapps/debian/rules
index 3253e7fff4a7279dd16e531351ed7070a188eb11..5a962c03a692f583da65b2bce2a863ee96e6af3e 100755
--- a/lalapps/debian/rules
+++ b/lalapps/debian/rules
@@ -71,7 +71,7 @@ install: build
dh_installdirs
set -e; \
- for v in 2.5 2.4; do \
+ for v in 2.4 2.5; do \
PYTHON="python$$v" \
CFLAGS="$(CFLAGS)" \
PKG_CONFIG_PATH=$(FRAMEPREFIX)/lib/pkgconfig:$(METAIOPREFIX)/lib/pkgconfig:$(LALPREFIX)/lib/pkgconfig \
@@ -103,11 +103,11 @@ install: build
set -e; \
for i in `find debian/lalapps/$(PREFIX)/bin -type f`; do \
echo $$i; \
- if head -n1 $$i | grep -q '^#!.*python$$' ; then \
- sed -i '1s/python$$/python2.4/' $$i; \
+ if head -n1 $$i | grep -q '^#!.*python2\..' ; then \
+ sed -i '1s/python2\../python/' $$i; \
fi ; \
done
-
+ cp -p debian/lalapps-user-env.* $(CURDIR)/debian/lalapps/$(PREFIX)/etc/
binary-common: build install
dh_testdir