[Pkg-octave-commit] [octave] 02/02: Ensure that octave-common always contains octave.jar.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave.

commit 10bcae5be5464054362404a2350e565336515be6
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Feb 24 18:50:00 2014 +0100

    Ensure that octave-common always contains octave.jar.
    
    That JAR file should be built even on those archs for which we disable java.
    
    + d/p/always-build-octave-jar.patch: new patch.
    + d/control: unconditionally build-depend on default-jdk.
---
 debian/control                               |  3 +-
 debian/patches/always-build-octave-jar.patch | 51 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 debian/rules                                 |  4 ++-
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index afbe334..d4d70cf 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,7 @@ Build-Depends: gfortran, debhelper (>= 9), automake, dh-autoreconf, texinfo,
  libgraphicsmagick++1-dev, libftgl-dev, libfontconfig1-dev,
  libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec,
  dpkg-dev (>= 1.16.1), llvm-dev [!armel !armhf !mips !mipsel !powerpc],
- default-jdk [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !mipsel !sparc],
- libqscintilla2-dev, libxft-dev, javahelper
+ default-jdk, libqscintilla2-dev, libxft-dev, javahelper
 Standards-Version: 3.9.5
 Homepage: http://www.octave.org/
 Vcs-Git: git://anonscm.debian.org/pkg-octave/octave.git
diff --git a/debian/patches/always-build-octave-jar.patch b/debian/patches/always-build-octave-jar.patch
new file mode 100644
index 0000000..e3edfdb
--- /dev/null
+++ b/debian/patches/always-build-octave-jar.patch
@@ -0,0 +1,51 @@
+Description: Ensure that octave.jar is built even if java is disabled
+ On some archs we pass --disable-java to the configure script, but we still
+ want octave-common to contain octave.jar if built on those archs.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-02-24
+---
+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
++
+ FCN_FILE_DIRS += java
+ 
+ java_FCN_FILES = \
+@@ -14,13 +17,10 @@ PKG_ADD_FILES += java/PKG_ADD
+ 
+ DIRSTAMP_FILES += java/$(octave_dirstamp)
+ 
+-if AMCOND_HAVE_JAVA
+ JAR_FILES += java/octave.jar
+-endif
+ 
+ org_octave_dir = org/octave
+ 
+-if AMCOND_HAVE_JAVA
+ JAVA_SRC = \
+   $(org_octave_dir)/ClassHelper.java \
+   $(org_octave_dir)/OctClassLoader.java \
+@@ -31,7 +31,6 @@ JAVA_SRC = \
+   $(org_octave_dir)/DlgListener.java \
+   $(org_octave_dir)/TeXtranslator.java \
+   $(org_octave_dir)/TeXcode.java
+-endif
+ 
+ JAVA_CLASSES = $(JAVA_SRC:.java=.class)
+ 
+@@ -61,11 +60,9 @@ java/images.stamp: $(srcdir_java_JAVA_IM
+ 	fi
+ 	touch $@
+ 
+-if AMCOND_HAVE_JAVA
+ java/octave.jar: java/images.stamp $(java_JAVA_CLASSES)
+ 	( cd java; "$(JAR)" cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) )
+ 	mv $@.t $@
+-endif
+ 
+ EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 47aa66b..1c56ac6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ dblquad-s390x.diff
 kfreebsd_tcgetattr.diff
 hurd_path_max.diff
 save-uint8-in-text-format.diff
+always-build-octave-jar.patch
diff --git a/debian/rules b/debian/rules
index 04be6c6..459e5b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,9 @@ export DEB_VERSION_UPSTREAM
 # a compilation failure (hurd-i386) or a test failure (other archs).
 # On mipsel java unit tests calling openjdk-7 cause a bus error at runtime.
 # This arch list must be kept in sync with the arch list qualifying
-# default-{jdk,jre} in debian/control.
+# default-jre in debian/control (note: we always want default-jdk in
+# build deps because it is needed for octave-common, see
+# debian/patches/always-build-octave-jar.patch).
 include /usr/share/dpkg/architecture.mk
 NO_JDK_ARCHS := hurd-i386 kfreebsd-amd64 kfreebsd-i386 mipsel sparc
 ifneq (,$(filter $(DEB_HOST_ARCH),$(NO_JDK_ARCHS)))

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