[Pkg-octave-commit] [octave] 07/10: d/p/always-build-octave-jar.patch: Refresh for new upstream version

[Rafael Laboissière]

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

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

commit b5ddb97c1bb4e2b4ca0b3d003651b2521134eb70
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Tue Jul 5 03:19:31 2016 -0300

    d/p/always-build-octave-jar.patch: Refresh for new upstream version
---
 debian/patches/always-build-octave-jar.patch | 43 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/debian/patches/always-build-octave-jar.patch b/debian/patches/always-build-octave-jar.patch
index bbc1ce1..f44c74a 100644
--- a/debian/patches/always-build-octave-jar.patch
+++ b/debian/patches/always-build-octave-jar.patch
@@ -3,25 +3,27 @@ Description: Ensure that octave.jar is built even if java is disabled
  want octave-common to contain octave.jar if built on those archs.
 Author: Sébastien Villemot <sebastien at debian.org>
 Forwarded: not-needed
-Reviewed-by: Rafael Laboissiere <rafael at laboissiere.net>
-Last-Update: 2015-04-18
+Reviewed-by: Rafael Laboissiere <rafael at debian.org>
+Last-Update: 2016-07-03
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/scripts/java/module.mk
 +++ b/scripts/java/module.mk
 @@ -1,3 +1,6 @@
-+JAVAC=javac
-+JAR=jar
++JAVAC = javac
++JAR = jar
 +
- FCN_FILE_DIRS += java
+ FCN_FILE_DIRS += scripts/java
  
- java_FCN_FILES = \
-@@ -17,13 +20,10 @@ PKG_ADD_FILES += java/PKG_ADD
- 
- DIRSTAMP_FILES += java/$(octave_dirstamp)
+ scripts_java_FCN_FILES = \
+@@ -11,22 +14,18 @@ scripts_java_FCN_FILES = \
+   scripts/java/javarmpath.m \
+   scripts/java/usejava.m
  
 -if AMCOND_HAVE_JAVA
- JAR_FILES += java/octave.jar
+ scripts_java_JAR_FILES = scripts/java/octave.jar
+ 
+ JAR_FILES += $(scripts_java_JAR_FILES)
 -endif
  
  org_octave_dir = org/octave
@@ -30,25 +32,24 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  JAVA_SRC = \
    $(org_octave_dir)/ClassHelper.java \
    $(org_octave_dir)/OctClassLoader.java \
-@@ -34,7 +34,6 @@ JAVA_SRC = \
-   $(org_octave_dir)/DlgListener.java \
-   $(org_octave_dir)/TeXtranslator.java \
-   $(org_octave_dir)/TeXcode.java
+   $(org_octave_dir)/Octave.java \
+   $(org_octave_dir)/OctaveReference.java \
+   $(org_octave_dir)/Matrix.java
 -endif
  
  JAVA_CLASSES = $(JAVA_SRC:.java=.class)
  
-@@ -64,13 +63,11 @@ java/images.stamp: $(srcdir_java_JAVA_IM
- 	fi && \
- 	touch $@
+@@ -38,13 +37,11 @@ $(scripts_java_JAVA_CLASSES) : %.class : %.java | scripts/java/$(octave_dirstamp
+ 	$(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
+ 		( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -Xlint:-options -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
  
 -if AMCOND_HAVE_JAVA
- java/octave.jar: java/images.stamp $(java_JAVA_CLASSES)
+ scripts/java/octave.jar: $(scripts_java_JAVA_CLASSES)
  	$(AM_V_GEN)rm -f $@-t $@ && \
- 	( cd java; \
- 	  "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) $(JAVA_IMAGES) ) && \
+ 	( cd scripts/java; \
+ 	  "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) ) && \
  	mv $@-t $@
 -endif
  
- EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES)
+ scripts_javadir = $(fcnfiledir)/java
  

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