r46333 - in /packages/feel++/trunk/debian: changelog control rules

[prudhomm at users.alioth.debian.org]

Author: prudhomm
Date: Fri Oct  4 07:46:21 2013
New Revision: 46333

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46333
Log:
final 0.95.0

Modified:
    packages/feel++/trunk/debian/changelog
    packages/feel++/trunk/debian/control
    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=46333&op=diff
==============================================================================
--- packages/feel++/trunk/debian/changelog	(original)
+++ packages/feel++/trunk/debian/changelog	Fri Oct  4 07:46:21 2013
@@ -1,3 +1,38 @@
+feel++ (1:0.95.0-final-1) unstable; urgency=low
+
+  [ Christophe Prud'homme ]
+  * New upstream release: final 0.95.0 version
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 04 Oct 2013 09:35:33 +0200
+
+feel++ (1:0.95.0-beta.4-1) unstable; urgency=low
+
+  [ Christophe Prud'homme ]
+  * New upstream release: beta.4
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Thu, 03 Oct 2013 23:23:51 +0200
+
+feel++ (1:0.95.0~gitcd3b85a-3) unstable; urgency=low
+
+  * use g++-4.8 on sparc
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Thu, 03 Oct 2013 09:42:23 +0200
+
+feel++ (1:0.95.0~gitcd3b85a-2) unstable; urgency=low
+
+  [Christophe Prud'homme]
+  * use g++ on sparc
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Thu, 03 Oct 2013 00:25:20 +0200
+
+feel++ (1:0.95.0~gitcd3b85a-1) unstable; urgency=low
+
+  [ Christophe Prud'homme ]
+  * New upstream release
+  * Ship glog and gflags modified libraries that fit feel++ needs
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Tue, 01 Oct 2013 23:12:41 +0200
+
 feel++ (1:0.95.0~git7a87e68-1) unstable; urgency=low
 
   [ Christophe Prud'homme ]

Modified: packages/feel++/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/control?rev=46333&op=diff
==============================================================================
--- packages/feel++/trunk/debian/control	(original)
+++ packages/feel++/trunk/debian/control	Fri Oct  4 07:46:21 2013
@@ -3,10 +3,11 @@
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), clang (>=3.2) | clang-3.3, gfortran (>=4.5),
+Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++-4.8, clang (>=3.2) | clang-3.3[!sparc], gfortran (>=4.5),
+	       chrpath,
 	       libboost-all-dev, libboost-mpi-dev,
 	       mpi-default-dev[!hurd-i386], mpi-default-bin[!hurd-i386],
-	       libeigen3-dev, libcln-dev, libgoogle-glog-dev, libgflags-dev,
+	       libeigen3-dev, libcln-dev,
 	       libslepc3.4.2-dev,
 	       libxml2-dev,
 	       libgmsh-dev, gmsh,
@@ -65,7 +66,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-dev, libfeel++1 (= ${binary:Version}), libvtk5-dev,
 	 libboost-all-dev, libboost-mpi-dev,
 	 mpi-default-dev, mpi-default-bin, libgmsh-dev,
-	 libeigen3-dev, libcln-dev, libgoogle-glog-dev, libgflags-dev,
+	 libeigen3-dev, libcln-dev,
 	 libslepc3.4.2-dev,
 	 libvtk5-dev, libxml2-dev, libtbb-dev [amd64 i386],
          libopenturns-dev, libann-dev, libglpk-dev

Modified: packages/feel++/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/rules?rev=46333&op=diff
==============================================================================
--- packages/feel++/trunk/debian/rules	(original)
+++ packages/feel++/trunk/debian/rules	Fri Oct  4 07:46:21 2013
@@ -8,9 +8,6 @@
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-export CXX=/usr/bin/clang++
-export CFLAGS=
-export CXXFLAGS=
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
@@ -23,14 +20,24 @@
 			-DFEELPP_MINIMAL_CONFIGURATION=ON
 
 DEB_CMAKE_EXTRA_FLAGS=                      \
-        -DCMAKE_CXX_COMPILER=/usr/bin/clang++ \
         -DCMAKE_BUILD_TYPE=Release          \
-	-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -g0"  \
 	-DPETSC_ARCH=$(PETSC_ARCH)-c-opt        \
 	-DPETSC_DIR=/usr/lib/petsc \
 	-DPETSC_EXECUTABLE_RUNS=ON          \
 	${FEELPP_INSTALL_ENABLERS}            \
 	$(CURDIR)/$(DEB_SRCDIR)
+
+ifeq (,$(filter $(DEB_HOST_ARCH),sparc))
+DEB_CMAKE_EXTRA_FLAGS+=\
+		-DCMAKE_CXX_COMPILER=/usr/bin/clang++ \
+		-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -g0"
+else
+DEB_CMAKE_EXTRA_FLAGS+=\
+		-DCMAKE_CXX_COMPILER=/usr/bin/g++-4.8 \
+		-DCMAKE_CXX_FLAGS_RELEASE="-Og -DNDEBUG"
+endif
+
+
 
 
 #build/feel++-apps::
@@ -42,6 +49,9 @@
 build/feel++-doc::
 	-cd $(DEB_BUILDDIR)/ && make doxygen
 
+binary-install/libfeel++1::
+	chrpath -d debian/libfeel++1/usr/lib/libfeelpp_glog*
+
 binary-install/feel++-apps::
 	strip debian/feel++-apps/usr/bin/*