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

[prudhomm at users.alioth.debian.org]

Author: prudhomm
Date: Sun Mar  9 20:49:28 2014
New Revision: 46593

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46593
Log:
fix powerpc build, upload 0.97beta1

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=46593&op=diff
==============================================================================
--- packages/feel++/trunk/debian/changelog	(original)
+++ packages/feel++/trunk/debian/changelog	Sun Mar  9 20:49:28 2014
@@ -1,3 +1,27 @@
+feel++ (1:0.97.0-beta.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Sun, 09 Mar 2014 20:32:12 +0000
+
+feel++ (1:0.97.0-alpha.3-3) unstable; urgency=medium
+
+  * try harder to fix powerpc build
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 07 Mar 2014 13:29:06 +0000
+
+feel++ (1:0.97.0-alpha.3-2) unstable; urgency=medium
+
+  * try fixing powerpc build
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Wed, 26 Feb 2014 15:18:54 +0000
+
+feel++ (1:0.97.0-alpha.3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Wed, 26 Feb 2014 12:21:05 +0000
+
 feel++ (1:0.97.0-alpha.1+git5a4f83e-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/feel++/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/control?rev=46593&op=diff
==============================================================================
--- packages/feel++/trunk/debian/control	(original)
+++ packages/feel++/trunk/debian/control	Sun Mar  9 20:49:28 2014
@@ -15,7 +15,7 @@
 	       doxygen, doxygen-latex,
 	       transfig,imagemagick,
 	       libtbb-dev[amd64 i386],
-	       libopenturns-dev, libann-dev, libglpk-dev
+	       libann-dev, libglpk-dev
 Standards-Version: 3.9.4
 Homepage: http://www.feelpp.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/feel++/trunk

Modified: packages/feel++/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/rules?rev=46593&op=diff
==============================================================================
--- packages/feel++/trunk/debian/rules	(original)
+++ packages/feel++/trunk/debian/rules	Sun Mar  9 20:49:28 2014
@@ -3,16 +3,17 @@
 DEB_AUTO_CLEANUP_RCS   := yes
 DEB_COMPRESS_EXCLUDE   := .pdf
 
+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)
 
 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
 
 
-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)
+
 
 FEELPP_INSTALL_ENABLERS=-DBUILD_TESTING=OFF                  \
 			-DFEELPP_ENABLE_DOXYGEN=ON          \
@@ -28,16 +29,20 @@
 	$(CURDIR)/$(DEB_SRCDIR)
 
 ifeq (,$(filter $(DEB_HOST_ARCH),sparc))
+ifeq (,$(filter $(DEB_HOST_ARCH),powerpc))	
 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/clang++ \
+		-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -g0  -fno-stack-protector"
+endif
+else
+DEB_CMAKE_EXTRA_FLAGS+=\
 		-DCMAKE_CXX_COMPILER=/usr/bin/g++-4.8 \
 		-DCMAKE_CXX_FLAGS_RELEASE="-Og -DNDEBUG"
 endif
-
-
 
 
 #build/feel++-apps::