[Pkg-octave-commit] [octave-ltfat] 05/06: Build blockproc.jar, which is deleted from the upstream tarball

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository octave-ltfat.

commit 4703ff82888f51cd1c30c85d07d809813bc5dbd9
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Nov 9 14:44:19 2014 -0200

    Build blockproc.jar, which is deleted from the upstream tarball
    
    + d/rules: Add commands for building blockproc.jar
    + d/control: Build-depend on default-jdk
    + d/p/fix-path-of-included-makefile.patch: New patch
    
    Git-Dch: Full
---
 debian/control                                     |  2 +-
 debian/patches/fix-path-of-included-makefile.patch | 16 ++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  6 ++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 2c6f2cf..c8fe714 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 laboissiere.net>
-Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev
+Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev, default-jdk
 Standards-Version: 3.9.5
 Homepage: http://octave.sourceforge.net/ltfat/
 Vcs-Git: git://anonscm.debian.org/pkg-octave/octave-ltfat.git
diff --git a/debian/patches/fix-path-of-included-makefile.patch b/debian/patches/fix-path-of-included-makefile.patch
new file mode 100644
index 0000000..df00871
--- /dev/null
+++ b/debian/patches/fix-path-of-included-makefile.patch
@@ -0,0 +1,16 @@
+Description: Fix path of include makefile snippet ostools.mk
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Forwarded: https://savannah.gnu.org/bugs/index.php?43566
+Last-Update: 2014-11-09
+
+--- octave-ltfat-2.0.1+dfsg.orig/inst/blockproc/java/Makefile
++++ octave-ltfat-2.0.1+dfsg/inst/blockproc/java/Makefile
+@@ -3,7 +3,7 @@
+ JC=javac
+ 
+ FLAGS=-source 1.6 -target 1.6
+-include ../../src/ostools.mk
++include ../../../src/ostools.mk
+ 
+ default:
+ 	$(JC) $(FLAGS) net/sourceforge/ltfat/*.java net/sourceforge/ltfat/thirdparty/*.java
diff --git a/debian/patches/series b/debian/patches/series
index 3cbe24b..644d194 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 autoload-yes.patch
 add-hardening-flags.patch
+fix-path-of-included-makefile.patch
diff --git a/debian/rules b/debian/rules
index ef9e5c2..cce2d39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,12 @@ export CFLAGS = $(shell dpkg-buildflags  --get CFLAGS) $(shell dpkg-buildflags -
 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::
+	$(MAKE) -C inst/blockproc/java
+	find inst/blockproc/java -name \*.class | xargs rm -f
+
 # Install the architecture independent files
 octdir = debian/octave-ltfat-common/usr/share/
 install/octave-ltfat-common:: install/octave-ltfat

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