[Pkg-octave-commit] [octave-interval] 01/05: Use the dh-based version of octave-pkg-dev

[Rafael Laboissiere]

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

rafael pushed a commit to branch master
in repository octave-interval.

commit 315bffe1e653e798acee4004a75584d0e33aaa8a
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri Dec 29 21:57:06 2017 -0200

    Use the dh-based version of octave-pkg-dev
---
 debian/clean   |  3 +++
 debian/control |  2 +-
 debian/rules   | 15 +++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..fa07522
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+src/*.oct
+src/*.o
+src/config.log
diff --git a/debian/control b/debian/control
index 0bc54c6..f90342b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Oliver Heimlich <oheim at posteo.de>,
 Build-Depends-Indep: texinfo, texlive, texlive-generic-recommended,
  imagemagick, gnuplot-nox,
-Build-Depends: debhelper (>= 10), cdbs, octave-pkg-dev (>= 1.4.4),
+Build-Depends: debhelper (>= 10), octave-pkg-dev (>= 2),
  libmpfr-dev (>= 3.1.0), ghostscript
 Standards-Version: 4.1.2
 Homepage: https://octave.sourceforge.io/interval/
diff --git a/debian/rules b/debian/rules
index 4289f05..de07511 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@
 # with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-include /usr/share/cdbs/1/class/octave-pkg.mk
+include /usr/share/octave-pkg-dev/octave-pkg.mk
 
 pkg = $(shell awk '/^Name:/ {print $$2; exit 0}' DESCRIPTION)
 pkg_version = $(shell awk '/^Version:/ {print $$2; exit 0}' DESCRIPTION)
@@ -34,7 +34,7 @@ endif
 DEB_INSTALL_DOCS_ALL =
 doc_dir = $(CURDIR)/$(debpkg)-doc/usr/share/doc/$(package)
 
-install/$(package)-doc:: install/$(package)
+install/$(package)-doc:
 	# The documentation build needs to load the package,
 	# so we have to set paths for the build process.
 	OCTAVE="$(octave) $(octave_options) --eval \"pkg ('prefix', [pwd(),'/../$(debpkg)/$(mpath)'], [pwd(),'/../$(debpkg)/$(bpath)']); pkg ('local_list', [pwd(),'/../local-list']); pkg ('global_list', [pwd(),'/../global-list']); pkg ('load', '$(pkg)');\"" \
@@ -44,12 +44,11 @@ install/$(package)-doc:: install/$(package)
 	mkdir -p $(doc_dir)/image
 	cp doc/manual.html $(doc_dir)/
 	cp doc/image/*.png doc/image/*.svg $(doc_dir)/image/
-
-remove-dirs::
 	rm -rf \
 		 $(CURDIR)/$(debpkg)/$(mpath)/*/doc
 
-clean::
-	make -C doc clean
-	test ! -e src/crlibm/Makefile || make -C src/crlibm maintainer-clean
-	rm -f src/*.oct src/*.o src/config.log
+DEB_MAKE_CLEAN_TARGET = -f debian/rules debian-clean
+debian-clean:
+	-make clean
+	-make -C doc clean
+	-test ! -e src/crlibm/Makefile || make -C src/crlibm maintainer-clean

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-interval.git