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

[Christophe Prud'homme]

SVN commit 3978 by prudhomm:

fixes for 9.0.1

 M  +2 -2      trilinos/trunk/debian/control  
 M  +0 -1      trilinos/trunk/debian/libtrilinos-dev.install  
 M  +0 -2      trilinos/trunk/debian/patches/series  
 M  +1 -1      trilinos/trunk/debian/rules  


--- trilinos/trunk/debian/control #3977:3978
@@ -12,7 +12,7 @@
 Package: libtrilinos
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libexpat1, ${shlibs:Depends}, ${misc:Depends}
 Suggests: libtrilinos-doc
 Conflicts: libtrilinos6.0, libtrilinos7.0, libtrilinos8.0
 Replaces: libtrilinos6.0, libtrilinos7.0, libtrilinos8.0
@@ -30,7 +30,7 @@
 Package: libtrilinos-dev
 Section: libdevel
 Architecture: any
-Depends: libtrilinos (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libtrilinos (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends}
 Suggests: libtrilinos-doc
 Conflicts: libtrilinos6.0-dev, libtrilinos7.0-dev, libtrilinos8.0-dev
 Replaces: libtrilinos6.0-dev, libtrilinos7.0-dev, libtrilinos8.0-dev
--- trilinos/trunk/debian/libtrilinos-dev.install #3977:3978
@@ -1,6 +1,5 @@
 debian/tmp/usr/lib/*.a /usr/lib
 debian/tmp/usr/lib/*.so /usr/lib
-debian/tmp/usr/include/*.h /usr/include/trilinos/
 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/patches/series #3977:3978
@@ -1,3 +1 @@
 gcc43.patch
-moocho.patch
-sharedlibs.patch
--- trilinos/trunk/debian/rules #3977:3978
@@ -45,7 +45,7 @@
   --enable-ifpack				\
   --enable-epetraext			\
   --enable-amesos 			\
-  --enable-didasko			\
+  --disable-didasko			\
   --enable-ml				\
   --enable-anasazi			\
   --enable-galeri				\