[feel++] 96/122: fix issue 664594

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository feel++.

commit f5ff4d813db1d350f61b43dae3442b1542d37d71
Author: Christophe Prudhomme <prudhomm at debian.org>
Date:   Tue Mar 20 04:58:20 2012 +0000

    fix issue 664594
---
 debian/changelog           |  6 ++++++
 debian/feel++-apps.install |  2 +-
 debian/rules               | 48 ++++++++--------------------------------------
 3 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 682e229..30e7997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+feel++ (0.91.1-2) unstable; urgency=low
+
+  * Fix  conflicting installation of cmake files (Closes: 664594)
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Tue, 20 Mar 2012 05:56:30 +0100
+
 feel++ (0.91.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/feel++-apps.install b/debian/feel++-apps.install
index de6add3..e60a91f 100644
--- a/debian/feel++-apps.install
+++ b/debian/feel++-apps.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/bin/*        /usr/bin
-debian/tmp/usr/share/*      /usr/share
+#debian/tmp/usr/share/*      /usr/share
 #debian/tmp/usr/lib/openturns      /usr/lib
 #debian/tmp/usr/lib/octave      /usr/lib
diff --git a/debian/rules b/debian/rules
index f05a0a9..cae21dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,47 +16,15 @@ 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
-
-ifeq "$(DEB_BUILD_ARCH)" "powerpc"
-FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
-                      -DBUILD_TESTING=OFF                  \
-                      -DFEEL_MINIMAL_CONFIGURATION=ON
-endif
-ifeq "$(DEB_BUILD_ARCH)" "alpha"
-FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
-                      -DBUILD_TESTING=OFF                  \
-                      -DFEEL_MINIMAL_CONFIGURATION=ON
-endif
-ifeq "$(DEB_BUILD_ARCH)" "s390"
-FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
-                      -DBUILD_TESTING=OFF                  \
-                      -DFEEL_MINIMAL_CONFIGURATION=ON
-endif
-ifeq "$(DEB_BUILD_ARCH)" "armel"
-FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
-                      -DBUILD_TESTING=OFF                  \
-                      -DFEEL_MINIMAL_CONFIGURATION=ON
-endif
-ifeq "$(DEB_BUILD_ARCH)" "mips"
-FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
-                      -DBUILD_TESTING=OFF                  \
-                      -DFEEL_MINIMAL_CONFIGURATION=ON
-endif
-ifeq "$(DEB_BUILD_ARCH)" "mipsel"
-FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
-                      -DBUILD_TESTING=OFF                  \
-                      -DFEEL_MINIMAL_CONFIGURATION=ON
-endif
+FEELPP_INSTALL_ENABLERS=-DBUILD_TESTING=OFF                  \
+		      -DFEELPP_ENABLE_DOCUMENTATION=ON       \
+                      -DFEELPP_MINIMAL_CONFIGURATION=ON
 
 ifeq "$(DEB_BUILD_ARCH)" "sparc"
-FEEL_MPI=-DMPI_COMPILER=/usr/bin/mpic++.lam \
+FEELPP_MPI=-DMPI_COMPILER=/usr/bin/mpic++.lam \
          -DMPI_LIBRARY="MPI_LIBRARY-NOTFOUND"
-FEEL_INSTALL_ENABLERS=-DFEEL_ENABLE_ALL=OFF                \
-                      -DBUILD_TESTING=OFF                  \
-                      -DFEEL_MINIMAL_CONFIGURATION=ON
 else
-FEEL_MPI=
+FEELPP_MPI=
 endif
 DEB_CMAKE_EXTRA_FLAGS=                      \
         -DCMAKE_BUILD_TYPE=Release          \
@@ -70,10 +38,10 @@ DEB_CMAKE_EXTRA_FLAGS=                      \
 	-DFEELPP_ENABLE_TESTS=OFF             \
 	-DFEELPP_ENABLE_EXAMPLES=OFF          \
 	-DFEELPP_OPUS_ENABLE_EADS=ON        \
-	${FEEL_MPI}                         \
-	${FEEL_INSTALL_ENABLERS}            \
+	${FEELPP_MPI}                         \
+	${FEELPP_INSTALL_ENABLERS}            \
 	-DTRILINOS_LIB_NOXLAPACK=           \
-	-DENABLE_INSTANTIATION_MODE=OFF \
+	-DFEELPP_ENABLE_INSTANTIATION_MODE=OFF \
 	$(CURDIR)/$(DEB_SRCDIR) 
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/feel++.git