r44575 - in /packages/feel++/trunk/debian: changelog feel++-apps.install rules

[prudhomm at users.alioth.debian.org]

Author: prudhomm
Date: Tue Mar 20 04:58:20 2012
New Revision: 44575

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44575
Log:
fix issue 664594

Modified:
    packages/feel++/trunk/debian/changelog
    packages/feel++/trunk/debian/feel++-apps.install
    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=44575&op=diff
==============================================================================
--- packages/feel++/trunk/debian/changelog (original)
+++ packages/feel++/trunk/debian/changelog Tue Mar 20 04:58:20 2012
@@ -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

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=44575&op=diff
==============================================================================
--- packages/feel++/trunk/debian/feel++-apps.install (original)
+++ packages/feel++/trunk/debian/feel++-apps.install Tue Mar 20 04:58:20 2012
@@ -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

Modified: packages/feel++/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/feel%2B%2B/trunk/debian/rules?rev=44575&op=diff
==============================================================================
--- packages/feel++/trunk/debian/rules (original)
+++ packages/feel++/trunk/debian/rules Tue Mar 20 04:58:20 2012
@@ -16,47 +16,15 @@
 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 @@
 	-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)