[Pkg-octave-commit] [octave-ltfat] 01/04: 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-ltfat.

commit 223d6a49a90023c81897ca72782e107e4c8b60a5
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   |  1 +
 debian/control |  2 +-
 debian/rules   | 15 +++++----------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..9ff2f73
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+inst/blockproc/java/blockproc.jar
diff --git a/debian/control b/debian/control
index 7228d82..0ab6956 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends: debhelper (>= 10), cdbs, octave-pkg-dev (>= 1.4.4),
+Build-Depends: debhelper (>= 10), octave-pkg-dev (>= 2),
   default-jdk, octave (>> 4.0.0~rc4-1)
 Standards-Version: 4.1.2
 Homepage: http://octave.sourceforge.net/ltfat/
diff --git a/debian/rules b/debian/rules
index c323791..65e3c86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/cdbs/1/class/octave-pkg.mk
+include /usr/share/octave-pkg-dev/octave-pkg.mk
 
 export CFLAGS = $(shell dpkg-buildflags  --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 
@@ -13,28 +13,23 @@ endif
 # needed for building the package correctly.  Even though there is one
 # in the tarball, it is not created by gbp-import-orig, hence the
 # mkdir command below.
-pre-build::
+pre-build:
 	mkdir -p lib
 
 # Build the blockproc.jar file, which is deleted from the upstream
 # tarball and clean up the generated *.class files
-build/octave-ltfat-common::
+build/octave-ltfat-common:
 	$(MAKE) -C inst/blockproc/java
 	find inst/blockproc/java -name \*.class | xargs rm -f
 
-# Clean the generated .jar file
-clean::
-	rm -f inst/blockproc/java/blockproc.jar
-
 # Install the architecture independent files
 octdir = debian/octave-ltfat-common/usr/share/
-install/octave-ltfat-common:: install/octave-ltfat
 
-install/octave-ltfat::
+install/octave-ltfat:
 	mkdir -p $(octdir)
 	mv debian/octave-ltfat/usr/share/octave $(octdir)
 
-install/octave-ltfat-common::
+install/octave-ltfat-common: install/octave-ltfat
 	# Remove the extra license file (Lintian warning)
 	@echo "*******************************************************"
 	@echo "Warning: check whether this fix is still needed:"

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