r43887 - in /packages/feel++/trunk/debian: changelog copyright feel++-apps.install patches/fixcompile.patch patches/series rules

prudhomm at users.alioth.debian.org prudhomm at users.alioth.debian.org
Fri Sep 9 16:12:43 UTC 2011 

Author: prudhomm
Date: Fri Sep  9 16:12:41 2011
New Revision: 43887

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43887
Log:
up

Added:
    packages/feel++/trunk/debian/patches/fixcompile.patch
Modified:
    packages/feel++/trunk/debian/changelog
    packages/feel++/trunk/debian/copyright
    packages/feel++/trunk/debian/feel++-apps.install
    packages/feel++/trunk/debian/patches/series
    packages/feel++/trunk/debian/rules

Modified: packages/feel++/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/changelog?rev=43887&op=diff
==============================================================================
--- packages/feel++/trunk/debian/changelog (original)
+++ packages/feel++/trunk/debian/changelog Fri Sep  9 16:12:41 2011
@@ -1,8 +1,41 @@
+feel++ (0.91.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at localhost>  Tue, 30 Aug 2011 10:24:07 +0200
+
+feel++ (0.91.0~svn7215-3) unstable; urgency=low
+
+  * debian/rules: fix PETSC_ARCH for armel. It should fix the build
+    failure on this arch
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Tue, 14 Jun 2011 08:10:15 +0200
+
+feel++ (0.91.0~svn7215-2) unstable; urgency=low
+
+  * debian/rules: define the proper PETSC_ARCH and fix kfreebsd build
+  * fix compilation in i386 (Closes: #628426).
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Mon, 13 Jun 2011 18:51:33 +0200
+
+feel++ (0.91.0~svn7215-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Mon, 13 Jun 2011 00:01:48 +0200
+
+feel++ (0.91.0~svn7079-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Wed, 25 May 2011 07:23:05 +0200
+
 feel++ (0.91.0~svn7063-2) unstable; urgency=low
 
   * debian/rules: re-enabled lam on sparc, hopefully fixing build on sparc
-  
- -- Christophe Prud'homme <prudhomm at debian.org>  Mon, 16 May 2011 22:47:47 +0200
+  * Fixed issue with g++-4.6 miscompilation (Closes: #625093).
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Mon, 16 May 2011 23:39:20 +0200
 
 feel++ (0.91.0~svn7063-1) unstable; urgency=low
 

Modified: packages/feel++/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/copyright?rev=43887&op=diff
==============================================================================
--- packages/feel++/trunk/debian/copyright (original)
+++ packages/feel++/trunk/debian/copyright Fri Sep  9 16:12:41 2011
@@ -93,7 +93,7 @@
  License can be found in the `/usr/share/common-licenses/GPL'
  file.
 
-Files: doc/tutorial/pngs/*.png
+Files: doc/manual/pngs/*.png
 Copyright: 2009, Christophe Prud'homme
 License: LGPL-2.1+
  On Debian systems the full text of the GNU Lesser General Public

Modified: packages/feel++/trunk/debian/feel++-apps.install
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/feel%2B%2B-apps.install?rev=43887&op=diff
==============================================================================
--- packages/feel++/trunk/debian/feel++-apps.install (original)
+++ packages/feel++/trunk/debian/feel++-apps.install Fri Sep  9 16:12:41 2011
@@ -1,1 +1,4 @@
-debian/tmp/usr/bin/feel_doc_*        /usr/bin
+debian/tmp/usr/bin/*        /usr/bin
+debian/tmp/usr/share/*      /usr/share
+debian/tmp/usr/lib/openturns      /usr/lib
+debian/tmp/usr/lib/octave      /usr/lib

Added: packages/feel++/trunk/debian/patches/fixcompile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/patches/fixcompile.patch?rev=43887&op=file
==============================================================================
--- packages/feel++/trunk/debian/patches/fixcompile.patch (added)
+++ packages/feel++/trunk/debian/patches/fixcompile.patch Fri Sep  9 16:12:41 2011
@@ -1,0 +1,23 @@
+Index: feel++-0.91.0~svn7215/doc/tutorial/CMakeLists.txt
+===================================================================
+--- feel++-0.91.0~svn7215.orig/doc/tutorial/CMakeLists.txt	2011-06-13 18:52:57.000000000 +0200
++++ feel++-0.91.0~svn7215/doc/tutorial/CMakeLists.txt	2011-06-13 18:54:30.000000000 +0200
+@@ -104,7 +104,7 @@
+ 
+ if ( NOT FEEL_MINIMAL_CONFIGURATION )
+ 
+-foreach( docex  myintegrals mymesh geotool myfunctionspace laplacian residualestimator stokes bratu nonlinearpow )
++foreach( docex  myintegrals mymesh geotool myfunctionspace laplacian residualestimator )
+   add_docex( ${docex} )
+ endforeach()
+ 
+@@ -119,7 +119,8 @@
+ message(STATUS "doc tutorial: ${LIST_APPS}")
+ 
+ 
+-IF ( OCTAVE_FOUND )
++#IF ( OCTAVE_FOUND )
++IF ( 0 )
+ 
+ GET_DIRECTORY_PROPERTY(cmake_include_directories INCLUDE_DIRECTORIES)
+ SET(octave_include_dirs)

Modified: packages/feel++/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/patches/series?rev=43887&op=diff
==============================================================================
--- packages/feel++/trunk/debian/patches/series (original)
+++ packages/feel++/trunk/debian/patches/series Fri Sep  9 16:12:41 2011
@@ -1,1 +1,0 @@
-

Modified: packages/feel++/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/rules?rev=43887&op=diff
==============================================================================
--- packages/feel++/trunk/debian/rules (original)
+++ packages/feel++/trunk/debian/rules Fri Sep  9 16:12:41 2011
@@ -3,15 +3,18 @@
 DEB_AUTO_CLEANUP_RCS   := yes
 DEB_COMPRESS_EXCLUDE   := .pdf
 
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
 
 export CFLAGS=
 export CXXFLAGS=
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+PETSC_ARCH=$(DEB_BUILD_GNU_SYSTEM)
 
 FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_DOCUMENTATION=ON
 
@@ -59,9 +62,14 @@
         -DCMAKE_BUILD_TYPE=Release          \
 	-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -g0"  \
 	-DCMAKE_CXX_COMPILER=/usr/bin/g++-4.5\
-	-DPETSC_ARCH=linux-gnu-c-opt        \
+	-DPETSC_ARCH=$(PETSC_ARCH)-c-opt        \
 	-DPETSC_DIR=/usr/lib/petscdir/3.1 \
 	-DPETSC_EXECUTABLE_RUNS=ON          \
+	-DFEEL_ENABLE_APPLICATIONS=OFF      \
+	-DFEEL_ENABLE_BENCHMARKS=OFF        \
+	-DFEEL_ENABLE_TESTS=OFF             \
+	-DFEEL_ENABLE_EXAMPLES=OFF          \
+	-DFEELPP_OPUS_ENABLE_EADS=ON        \
 	${FEEL_MPI}                         \
 	${FEEL_INSTALL_ENABLERS}            \
 	-DTRILINOS_LIB_NOXLAPACK=           \
@@ -70,8 +78,8 @@
 #build/feel++-apps::
 #	-cd $(DEB_BUILDDIR) && ctest -D Experimental
 
-build/libfeel++::
-	-cd $(DEB_BUILDDIR) && cmake ..
+#build/libfeel++::
+#	-cd $(DEB_BUILDDIR) && make doc
 
 build/feel++-doc::
 	-cd $(DEB_BUILDDIR)/doc/api && make doxygen

More information about the debian-science-commits mailing list