[freefoam] 05/09: Use dh 9 instead of cdbs.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository freefoam.

commit f7a772eb92c9bbc97b16c964959479032eca7f54
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Sep 17 20:50:50 2014 +0200

    Use dh 9 instead of cdbs.
---
 debian/compat           |  2 +-
 debian/control          |  2 +-
 debian/freefoam.install |  2 ++
 debian/rules            | 84 ++++++-------------------------------------------
 4 files changed, 13 insertions(+), 77 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 1ef08be..81973c4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
 Vcs-Git: git://git.debian.org/git/debian-science/packages/freefoam.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freefoam.git
 Homepage: http://freefoam.wiki.sourceforge.net/
-Build-Depends: cdbs, debhelper (>= 5.0.24), python-support, cmake, flex, gawk,
+Build-Depends: debhelper (>= 9), cmake, flex, gawk,
  python, libreadline6-dev, zlib1g-dev, libscotch-dev, mpi-default-dev,
  mpi-default-bin, paraview (>= 3.8), dpkg-dev (>= 1.16.1~)
 Build-Depends-Indep: doxygen, libxml2-utils,
diff --git a/debian/freefoam.install b/debian/freefoam.install
index e08bd23..01fa831 100644
--- a/debian/freefoam.install
+++ b/debian/freefoam.install
@@ -4,3 +4,5 @@ debian/tmp/usr/bin/* /usr/bin
 debian/man1/* /usr/share/man/man1
 debian/tmp/etc/freefoam/* /etc/freefoam
 debian/tmp/usr/share/freefoam/foamLog.db
+data/shellFunctions/bashCompletion/freefoam /etc/bash_completion.d/
+
diff --git a/debian/rules b/debian/rules
index 35fdbc5..8e5542d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,12 @@
 #!/usr/bin/make -f
+%:
+	dh $@ --buildsystem=cmake --parallel --with python2
 
-#export DH_VERBOSE=1
-
-# Injecting CPPFLAGS:
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-CXXFLAGS+=$(CPPFLAGS) -fpermissive
-
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
- 
 export OMPI_MCA_plm_rsh_agent=/bin/false
+export DEB_CXXFLAGS_MAINT_APPEND = -fpermissive
 
 FF_SUBDIR=freefoam
 
-
 FF_CONFIG_THIRD_PARTY=					\
 	-DFOAM_BUILD_PRIVATE_METIS=OFF			\
 	-DFOAM_BUILD_PRIVATE_PARMETIS=OFF		\
@@ -40,7 +31,7 @@ FF_DOC=							\
 	-DFOAM_ENABLE_XHTML_GUIDES=OFF			\
 	-DFOAM_ENABLE_XHTML_HELP=OFF			\
 	-DFOAM_ENABLE_MATHJAX=OFF			\
-	-DFOAM_ENABLE_DOXYGEN_DOCS=OFF			\
+	-DFOAM_ENABLE_DOXYGEN_DOCS=OFF		\
 	-DFOAM_ENABLE_MANPAGE_HELP=OFF			\
 	-DFOAM_DOCS_FOR_SF=OFF				\
 
@@ -58,7 +49,7 @@ FF_INSTALL=								\
 	-DFOAM_INSTALL_TUTORIALS_PATH=/usr/share/doc/$(FF_SUBDIR)	\
 	-DFOAM_INSTALL_USERDFOAM_PATH=/usr/lib/$(FF_SUBDIR)/plugins1/ensightReader
 
-DEB_CMAKE_EXTRA_FLAGS= 					\
+extra_flags= 					\
 	-DFOAM_EXE_PREFIX=freefoam-			\
 	-DFOAM_ENABLE_METIS=OFF				\
 	-DFOAM_ENABLE_MGRIDGEN=OFF			\
@@ -74,65 +65,8 @@ DEB_CMAKE_EXTRA_FLAGS= 					\
 	$(FF_DOC)					\
 	$(FF_INSTALL)
 
-DEB_DH_MAKESHLIBDEPS_ARGS_libfreefoam1=-X/usr/lib/$(FF_SUBDIR)
-
-TOP_BUILDDIR := $(DEB_BUILDDIR)
-
-# Re-configure for doc packages
-configure/freefoam-user-doc configure/freefoam-dev-doc:: debian/freefoam-enable-docs.stamp
-
-debian/freefoam-enable-docs.stamp:
-	cd $(TOP_BUILDDIR); \
-	cmake \
-	  -DFOAM_ENABLE_PDF_GUIDES=ON \
-	  -DFOAM_ENABLE_DOXYGEN_DOCS=ON \
-	  $(CURDIR)
-	touch $@
-
-build/freefoam-user-doc:: DEB_MAKE_BUILD_TARGET := UserGuide-pdf
-
-build/freefoam-dev-doc:: DEB_MAKE_BUILD_TARGET := apidoc-all
-
-install/libfreefoam1::
-	install -d $(CURDIR)/debian/libfreefoam1/usr/lib/$(FF_SUBDIR)
-
-install/libfreefoam-dev::
-	install -d $(CURDIR)/debian/libfreefoam-dev/usr/include/$(FF_SUBDIR)
-	install -d $(CURDIR)/debian/libfreefoam-dev/usr/share/$(FF_SUBDIR)
-	rm $(CURDIR)/debian/tmp/usr/share/$(FF_SUBDIR)/templates/foamScript
-
-install/freefoam::
-	install -d $(CURDIR)/debian/freefoam/usr/bin
-	install -d $(CURDIR)/debian/freefoam/usr/share/man/man1
-	install -d $(CURDIR)/debian/freefoam/etc/freefoam
-	install -d $(CURDIR)/debian/freefoam/etc/bash_completion.d
-	cp $(CURDIR)/data/shellFunctions/bashCompletion/freefoam $(CURDIR)/debian/freefoam/etc/bash_completion.d/
-
-install/freefoam-user-doc:: DEB_BUILDDIR_freefoam-user-doc := $(TOP_BUILDDIR)/doc/UserGuide
-install/freefoam-user-doc:: install-tutorials
-	+$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET)
-
-install-tutorials: DEB_BUILDDIR_freefoam-user-doc := $(TOP_BUILDDIR)/tutorials
-install-tutorials: build/freefoam-user-doc
-	+$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET)
-	install -d $(CURDIR)/debian/freefoam-user-doc/usr/share/doc/freefoam-user-doc/tutorials
-	rm -rf $(CURDIR)/debian/tmp/usr/share/doc/freefoam/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/data
-
-# Depends on build/freefoam-user-doc because the installation is started in
-# $(DEB_BUILDDIR)/doc, which also requires the UserGuide to be built.
-install/freefoam-dev-doc:: DEB_BUILDDIR_freefoam-dev-doc := $(TOP_BUILDDIR)/doc
-install/freefoam-dev-doc:: build/freefoam-user-doc
-	+$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET)
-	rm -f $(CURDIR)/debian/tmp/usr/share/doc/freefoam/API/jquery.js
-
-binary-install/libfreefoam1::
-	dh_pysupport -plibfreefoam1
-
-binary-install/libfreefoam-dev::
-	dh_pysupport -plibfreefoam-dev
-
-binary-install/freefoam::
-	dh_pysupport -pfreefoam
+override_dh_auto_configure:
+	dh_auto_configure -- $(extra_flags)
 
-clean::
-	rm -f debian/freefoam-enable-docs.stamp
+override_dh_installchangelogs:
+	dh_installchangelogs -Xchanges

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