[fftw] 01/01: bump debhelper compat to 9

[Thibaut Jean-Claude Paumard]

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

thibaut pushed a commit to branch master
in repository fftw.

commit 356885e080ad1a48db45f35f02e569cc94589293
Author: Thibaut Paumard <thibaut at debian.org>
Date:   Tue Jul 12 09:45:11 2016 +0200

    bump debhelper compat to 9
---
 debian/changelog         | 7 +++++++
 debian/compat            | 2 +-
 debian/fftw-dev.install  | 1 +
 debian/rules             | 9 ++++++---
 debian/sfftw-dev.install | 1 +
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 028ba93..7983296 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fftw (2.1.5-4) unstable; urgency=medium
+
+  * Bug fix: "Removal of debhelper compat 4", thanks to
+    niels at thykier.net</a>; (Closes: #817452).
+
+ -- Thibaut Paumard <thibaut at debian.org>  Tue, 12 Jul 2016 09:42:31 +0200
+
 fftw (2.1.5-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/fftw-dev.install b/debian/fftw-dev.install
index d1bffed..86143be 100644
--- a/debian/fftw-dev.install
+++ b/debian/fftw-dev.install
@@ -1,3 +1,4 @@
 usr/include/*
 usr/lib/lib*.a
 usr/lib/lib*.so
+usr/share/doc/*
diff --git a/debian/rules b/debian/rules
index 098c62b..3d1a7ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,8 @@ clean1st:
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
 	[ ! -f Makefile ] || $(MAKE) -C doc clean-local
-	[ ! -f Makefile ] || $(MAKE) -C FAQ clean 
+	[ ! -f Makefile ] || $(MAKE) -C FAQ clean
+	rm -f compile fftw/libfftw.la mpi/libfftw_mpi.la mpi/librfftw_mpi.la rfftw/librfftw.la threads/libfftw_threads.la threads/librfftw_threads.la
 	rm -rf $(CURDIR)/debian/tmp-*
 	dh_clean 
 
@@ -96,12 +97,14 @@ install-arch:
 	dh_testroot
 	dh_clean -k -s
 	dh_installdirs -s
+	mkdir -p $(CURDIR)/debian/tmp-single/usr/share/doc/sfftw-dev/fortran
+	mkdir -p $(CURDIR)/debian/tmp-double/usr/share/doc/fftw-dev/fortran
+	cp -a fortran/fftw_f77.i $(CURDIR)/debian/tmp-single/usr/share/doc/sfftw-dev/fortran/
+	cp -a fortran/fftw_f77.i $(CURDIR)/debian/tmp-double/usr/share/doc/fftw-dev/fortran/
 	dh_install --sourcedir=$(CURDIR)/debian/tmp-single -p sfftw2
 	dh_install --sourcedir=$(CURDIR)/debian/tmp-single -p sfftw-dev
 	dh_install --sourcedir=$(CURDIR)/debian/tmp-double -p fftw2
 	dh_install --sourcedir=$(CURDIR)/debian/tmp-double -p fftw-dev
-	dh_install -p sfftw-dev fortran/fftw_f77.i usr/share/doc/sfftw-dev/fortran
-	dh_install -p fftw-dev fortran/fftw_f77.i usr/share/doc/fftw-dev/fortran
 
 binary-common:
 	dh_testdir
diff --git a/debian/sfftw-dev.install b/debian/sfftw-dev.install
index d1bffed..86143be 100644
--- a/debian/sfftw-dev.install
+++ b/debian/sfftw-dev.install
@@ -1,3 +1,4 @@
 usr/include/*
 usr/lib/lib*.a
 usr/lib/lib*.so
+usr/share/doc/*

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