[Git][java-team/jblas][master] 7 commits: Standards-Version updated to 4.1.4
Emmanuel Bourg
gitlab at salsa.debian.org
Tue May 8 23:35:11 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jblas
Commits:
be8854c6 by Emmanuel Bourg at 2018-05-09T00:14:06+02:00
Standards-Version updated to 4.1.4
- - - - -
82eca1af by Emmanuel Bourg at 2018-05-09T00:14:16+02:00
Switch to debhelper level 11
- - - - -
bc0a692e by Emmanuel Bourg at 2018-05-09T00:15:09+02:00
Removed Soeren Sonnenburg from the uploaders (Closes: #881836)
- - - - -
3c4be446 by Emmanuel Bourg at 2018-05-09T00:17:22+02:00
Merged and simplified the Java 9 patches
- - - - -
1e81f847 by Emmanuel Bourg at 2018-05-09T00:24:10+02:00
Fixed the build failure with Java 10 (Closes: #898227)
- - - - -
f7139278 by Emmanuel Bourg at 2018-05-09T00:30:29+02:00
Removed the build conflict with locales-all
- - - - -
8bf0d761 by Emmanuel Bourg at 2018-05-09T00:30:40+02:00
Upload to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/compat
- debian/control
- + debian/patches/java10.patch
- − debian/patches/java9-part2.patch
- debian/patches/java9.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+jblas (1.2.4-2) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the build failure with Java 10 (Closes: #898227)
+ * Removed Soeren Sonnenburg from the uploaders (Closes: #881836)
+ * Removed the build conflict with locales-all
+ * Merged and simplified the Java 9 patches
+ * Standards-Version updated to 4.1.4
+ * Switch to debhelper level 11
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 09 May 2018 00:30:33 +0200
+
jblas (1.2.4-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,18 @@ Source: jblas
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders:
- Soeren Sonnenburg <sonne at debian.org>,
Torsten Werner <twerner at debian.org>,
tony mancill <tmancill at debian.org>
Build-Depends:
ant-optional,
- debhelper (>= 10),
+ debhelper (>= 11),
default-jdk,
gfortran,
junit4,
libatlas-base-dev,
locales,
ruby
-Build-Conflicts:
- locales-all
-Standards-Version: 4.1.1
+Standards-Version: 4.1.4
Section: science
Homepage: http://jblas.org
Vcs-Git: https://anonscm.debian.org/git/pkg-java/jblas.git
=====================================
debian/patches/java10.patch
=====================================
--- /dev/null
+++ b/debian/patches/java10.patch
@@ -0,0 +1,30 @@
+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -139,23 +139,11 @@
+ </javac>
+ </target>
+ <target name="javah" depends="prepare" description="run javah">
+- <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
++ <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes" nativeHeaderDir="${include}">
+ <src path="${src}" />
+ <include name="**/NativeBlas.java" />
+ <include name="**/ArchFlavor.java" />
+ </javac>
+- <javah destdir="${include}" force="yes">
+- <class name="${pkgbase}.NativeBlas" />
+- <classpath>
+- <pathelement path="${bin}" />
+- </classpath>
+- </javah>
+- <javah destdir="${include}" force="yes">
+- <class name="org.jblas.util.ArchFlavor" />
+- <classpath>
+- <pathelement path="${bin}" />
+- </classpath>
+- </javah>
+ </target>
+ <target name="generate-float" depends="preprocess" description="generate float versions of classes">
+ <class-to-float class="${pkgbase}.DoubleMatrix"/>
=====================================
debian/patches/java9-part2.patch deleted
=====================================
--- a/debian/patches/java9-part2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 49d1f77e1da8d2fdba54ff2b8d35a36d7403724d Mon Sep 17 00:00:00 2001
-From: "Chris West (Faux)" <git at goeswhere.com>
-Date: Wed, 23 Aug 2017 20:41:39 +0100
-Subject: [PATCH] java9: remove /jre suffix iff it's present
-
----
- config/config_java.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/config_java.rb b/config/config_java.rb
-index 4e309ec..f9c0f90 100644
---- a/config/config_java.rb
-+++ b/config/config_java.rb
-@@ -55,7 +55,7 @@
- if ENV.include? 'JAVA_HOME'
- java_home = ENV['JAVA_HOME']
- else
-- java_home = dir(File.dirname(%x(java -cp config PrintProperty java.home)))
-+ java_home = dir(%x(java -cp config PrintProperty java.home).chomp.gsub(/\/jre$/, ''))
- end
- #if CONFIG['OS_NAME'] == 'Mac\ OS\ X'
- # java_home = File.join(java_home, 'Home')
=====================================
debian/patches/java9.patch
=====================================
--- a/debian/patches/java9.patch
+++ b/debian/patches/java9.patch
@@ -1,53 +1,22 @@
-From 999ff7186a756751ea03ca2b53e2af783135900e Mon Sep 17 00:00:00 2001
+From 49d1f77e1da8d2fdba54ff2b8d35a36d7403724d Mon Sep 17 00:00:00 2001
From: "Chris West (Faux)" <git at goeswhere.com>
-Date: Wed, 23 Aug 2017 20:32:09 +0100
-Subject: [PATCH] java9: use -source/-target 1.6 as 1.5 is unsupported
+Date: Wed, 23 Aug 2017 20:41:39 +0100
+Subject: [PATCH] java9: remove /jre suffix iff it's present
---
- build.xml | 6 +++---
- pom.xml | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ config/config_java.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/build.xml b/build.xml
-index 3092333..87a6117 100644
---- a/build.xml
-+++ b/build.xml
-@@ -126,12 +126,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- <mkdir dir="${bin}" />
- </target>
- <target name="compile" depends="prepare,generate-float" description="compile java code">
-- <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
-+ <javac destdir="${bin}" encoding="utf-8" source="1.6" debug="on" compiler="javac1.5" target="1.6" fork="yes" nowarn="yes">
- <src path="${src}" />
- </javac>
- </target>
- <target name="compile-test" depends="compile" description="compile java test code">
-- <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
-+ <javac destdir="${bin}" encoding="utf-8" source="1.6" debug="on" compiler="javac1.5" target="1.6" fork="yes" nowarn="yes">
- <src path="${test}" />
- <classpath>
- <pathelement location="${external}/junit-4.8.2.jar" />
-@@ -139,7 +139,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- </javac>
- </target>
- <target name="javah" depends="prepare" description="run javah">
-- <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
-+ <javac destdir="${bin}" encoding="utf-8" source="1.6" debug="on" compiler="javac1.5" target="1.6" fork="yes" nowarn="yes">
- <src path="${src}" />
- <include name="**/NativeBlas.java" />
- <include name="**/ArchFlavor.java" />
-diff --git a/pom.xml b/pom.xml
-index e67ff5e..e6dccf0 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -58,8 +58,8 @@
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
-- <source>1.5</source>
-- <target>1.5</target>
-+ <source>1.6</source>
-+ <target>1.6</target>
- </configuration>
- </plugin>
-
+diff --git a/config/config_java.rb b/config/config_java.rb
+index 4e309ec..f9c0f90 100644
+--- a/config/config_java.rb
++++ b/config/config_java.rb
+@@ -55,7 +55,7 @@
+ if ENV.include? 'JAVA_HOME'
+ java_home = ENV['JAVA_HOME']
+ else
+- java_home = dir(File.dirname(%x(java -cp config PrintProperty java.home)))
++ java_home = dir(%x(java -cp config PrintProperty java.home).chomp.gsub(/\/jre$/, ''))
+ end
+ #if CONFIG['OS_NAME'] == 'Mac\ OS\ X'
+ # java_home = File.join(java_home, 'Home')
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ version-property.patch
debug-symbols.patch
javadoc.patch
java9.patch
-java9-part2.patch
+java10.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,3 @@ else
export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/$(DEB_BUILD_ARCH)
endif
dh_auto_test
-
-get-orig-source:
- -uscan --force-download --download-current-version
- @echo successfully retrieved upstream tarball
View it on GitLab: https://salsa.debian.org/java-team/jblas/compare/455154e1d1ee5edea3e9c0a46e9633015730197f...8bf0d7616bfe5e10fa0560039c66df1b9ef2e0b6
---
View it on GitLab: https://salsa.debian.org/java-team/jblas/compare/455154e1d1ee5edea3e9c0a46e9633015730197f...8bf0d7616bfe5e10fa0560039c66df1b9ef2e0b6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180508/67385994/attachment.html>
More information about the pkg-java-commits
mailing list