[feel++] 01/02: rewrite d/rules using the dh sequencer

Mattia Rizzolo mattia at debian.org
Mon Apr 18 16:46:08 UTC 2016


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

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

commit 5beace4230a4b5d170c3df410ef3e199ceb5a35a
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Apr 18 16:45:40 2016 +0000

    rewrite d/rules using the dh sequencer
---
 debian/compat  |  2 +-
 debian/control |  4 +--
 debian/rules   | 80 +++++++++++++---------------------------------------------
 3 files changed, 20 insertions(+), 66 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 7b1f186..21d91e0 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,10 @@ Build-Depends:
  chrpath,
  clang-3.5,
  cmake (>=2.6),
- debhelper (>= 7),
+ debhelper (>= 9),
  doxygen,
  doxygen-latex,
  flex,
- g++ (>=4.8),
  gfortran (>=4.5),
  gmsh,
  imagemagick,
@@ -30,7 +29,6 @@ Build-Depends:
  libxml2-dev,
  mpi-default-bin[!hurd-i386],
  mpi-default-dev[!hurd-i386],
- quilt,
  slepc-dev,
  transfig,
 Standards-Version: 3.9.4
diff --git a/debian/rules b/debian/rules
index d5a0c14..721edca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,20 @@
 #!/usr/bin/make -f
 
-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
-
-
-PETSC_ARCH=$(DEB_BUILD_GNU_SYSTEM)
-
-
-	FEELPP_INSTALL_ENABLERS=-DBUILD_TESTING=OFF                  \
-			-DFEELPP_ENABLE_DOXYGEN=ON          \
-			-DFEELPP_ENABLE_DOCUMENTATION=ON       \
-			-DFEELPP_MINIMAL_CONFIGURATION=ON
-
-DEB_CMAKE_EXTRA_FLAGS=                      \
-        -DCMAKE_BUILD_TYPE=Release          \
-	-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))
-ifeq (,$(filter $(DEB_HOST_ARCH),powerpc))	
-DEB_CMAKE_EXTRA_FLAGS+=\
-		-DCMAKE_CXX_COMPILER=/usr/bin/clang++-3.5 \
-		-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -g0"
-else
-DEB_CMAKE_EXTRA_FLAGS+=\
-		-DCMAKE_CXX_COMPILER=/usr/bin/clang++-3.5 \
-		-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::
-#	-cd $(DEB_BUILDDIR) && ctest -D Experimental
-
-#build/libfeel++::
-#	-cd $(DEB_BUILDDIR) && make doc
-
-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/*
-
-get-orig-source:
-	uscan --force-download
+export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+%:
+	dh $@ --parallel --buildsystem=cmake
+
+override_dh_auto_configure:
+	dh_auto_configure -O--buildsystem=cmake --  \
+		-DCMAKE_BUILD_TYPE=Release              \
+		-DPETSC_ARCH=$(PETSC_ARCH)-c-opt        \
+		-DPETSC_EXECUTABLE_RUNS=ON              \
+		-DBUILD_TESTING=ON                      \
+		-DFEELPP_ENABLE_DOXYGEN=ON              \
+		-DFEELPP_ENABLE_DOCUMENTATION=ON        \
+		-DFEELPP_MINIMAL_CONFIGURATION=ON       \
+
+override_dh_compress:
+	dh_compress -X.pdf

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



More information about the debian-science-commits mailing list