[Pkg-scicomp-commits] trilinos/trunk/debian

[Christophe Prud'homme]

SVN commit 4423 by prudhomm:

fix some bugs


 M  +2 -1      trilinos/trunk/debian/README.Debian  
 M  +10 -0     trilinos/trunk/debian/changelog  
 M  +2 -2      trilinos/trunk/debian/libtrilinos-dev.install  
 M  +3 -3      trilinos/trunk/debian/rules  


--- trilinos/trunk/debian/README.Debian #4422:4423
@@ -14,6 +14,7 @@
  - ml
  - belos
  - meros
+ - sacado
 
 Debian Trilinos libraries renaming
 ==================================
@@ -24,4 +25,4 @@
  - avoiding conflicts with other libraries/packages
  - identifying available trilinos libraries
 
- -- Christophe Prud'homme <prudhomm at debian.org>, Mon, 11 Aug 2008 08:48:13 +0200
+ -- Christophe Prud'homme <prudhomm at debian.org>, Sat,  9 May 2009 14:11:52 +0200
--- trilinos/trunk/debian/changelog #4422:4423
@@ -1,3 +1,13 @@
+trilinos (9.0.2.dfsg-2) unstable; urgency=low
+
+  * debian/rules: enable sacado
+  * Bug fix: "Missing Sacado", thanks to Adam C Powell IV (Closes:
+    #527835).
+  * Bug fix: "error when trying to install together", thanks to Ralf
+    Treinen (Closes: #526992).
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Sat, 09 May 2009 14:19:14 +0200
+
 trilinos (9.0.2.dfsg-1) unstable; urgency=low
 
   * Initial release Closes: #362293
--- trilinos/trunk/debian/libtrilinos-dev.install #4422:4423
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/*.a /usr/lib
-debian/tmp/usr/lib/*.so /usr/lib
+debian/tmp/usr/lib/libtrilinos*.a /usr/lib
+debian/tmp/usr/lib/libtrilinos*.so /usr/lib
 debian/tmp/usr/include/trilinos/*.h /usr/include/trilinos/
 debian/tmp/usr/include/trilinos/*.hpp /usr/include/trilinos/
 debian/tmp/usr/include/trilinos/*.H /usr/include/trilinos/
--- trilinos/trunk/debian/rules #4422:4423
@@ -57,6 +57,7 @@
   --enable-meros \
   --enable-moertel \
   --enable-moocho \
+  --enable-sacado \
   --enable-python \
   --enable-pytrilinos\
   --disable-examples --disable-tests    \
@@ -175,7 +176,6 @@
 	(cd debian/tmp/usr/lib/ && ln -sf libtrilinos_moochothyra.so.${version} libtrilinos_moochothyra.so);
 
 
-
 ##############################################################
 ## NOX
 ##
@@ -244,8 +244,8 @@
 get-orig-source:
 #	uscan --force-download --symlink --check-dirname-level 0 --destdir "$$TMPDIR" ; \
 
-	set -ex ; 
-	test -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig && rm -rf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig; 
+	set -ex ;
+	test -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig && rm -rf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig;
 	TMPDIR=`mktemp -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig` ; \
 	cp ../tarballs/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz "$$TMPDIR"; \
 	tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz ; \