Debian package update

Makefile.am

@@ -241,7 +241,7 @@ INCLUDES = $(PYTHON_ADDINCLUDES)
 
 stimfit_CXXFLAGS = $(OPT_CXXFLAGS)
 stimfit_LDFLAGS = $(WX_LIBS) $(LIBLAPACK_LDFLAGS) -lfftw3 -lhdf5 -lhdf5_hl $(PYTHON_ADDLDFLAGS)
-stimfit_LDADD = $(PYTHON_ADDLIBS) ./src/app/libstimfit.a
+stimfit_LDADD = $(PYTHON_ADDLIBS) $(LIBSTF_LDFLAGS) ./src/app/libstimfit.a
 
 install-exec-hook:
 	$(LIBTOOL) --finish $(prefix)/lib

configure.in

@@ -103,7 +103,14 @@ AC_SUBST(STF_PYTHON_LIBNAME)
 AC_SUBST(STFIO_PYTHON_LIBNAME)
 
 # Flags for getting libstf/libstfio into private directory
-LIBSTF_LDFLAGS="-Wl,-rpath,${prefix}/lib/stimfit -avoid-version"
+# When building for deb, use the final prefix:
+if test ${ac_py_prefix} = ''; then
+  DEBPREFIX=${prefix}
+else
+  DEBPREFIX='/usr'
+fi
+
+LIBSTF_LDFLAGS="-Wl,-rpath,${DEBPREFIX}/lib/stimfit -avoid-version"
 AC_SUBST(LIBSTF_LDFLAGS)
 
 AC_MSG_CHECKING(for cpu type)

debian/changelog

+stimfit (0.10.6-0ubuntu2) lucid; urgency=low
+
+  * Fixed a bug when accessing files from the Python shell.
+
+ -- Christoph Schmidt-Hieber <christsc@gmx.de>  Thu, 27 Jan 2011 17:12:21 +0000
+
+stimfit (0.10.6-0ubuntu1) maverick; urgency=low
+
+  * Fixed a bug when accessing files from the Python shell.
+
+ -- Christoph Schmidt-Hieber <christsc@gmx.de>  Thu, 27 Jan 2011 17:12:21 +0000
+
 stimfit (0.10.5-0ubuntu5) lucid; urgency=low
 
   * Reversioned for lucid.

debian/mkdeb.sh

@@ -4,12 +4,13 @@ VERSION=0.10.6
 
 make dist
 mkdir -p ../deb/
+rm -rf ../deb/*
 cp -v stimfit-${VERSION}.tar.gz ../deb/
 cp -v stimfit-${VERSION}.tar.gz ../deb/stimfit_${VERSION}.orig.tar.gz
 cd ../deb/
 tar -xzf stimfit_${VERSION}.orig.tar.gz
 cd stimfit-${VERSION}
 mkdir -p debian
-cp -rv ../../../dist/debian/* ./debian
+cp -rv ../../../debian/* ./debian
 debuild -S -sa
 sudo pbuilder build ../*.dsc