Emmanuel Bourg pushed to branch master at Debian Java Maintainers / java-gnome
Commits:
5c24d3ad by Emmanuel Bourg at 2018-05-08T22:48:04+02:00
Standards-Version updated to 4.1.4
- - - - -
2ee468b1 by Emmanuel Bourg at 2018-05-08T22:48:19+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
3e9719b6 by Emmanuel Bourg at 2018-05-16T16:01:26+02:00
Fixed the build failure with Java 10 (Closes: #898221)
- - - - -
afa67a2f by Emmanuel Bourg at 2018-05-16T16:02:14+02:00
Removed the duplicate Section field in debian/control
- - - - -
d661bcc2 by Emmanuel Bourg at 2018-05-16T16:02:46+02:00
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/07_java10_compatibility.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+java-gnome (4.1.3-8) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the build failure with Java 10 (Closes: #898221)
+ * Standards-Version updated to 4.1.4
+ * Use salsa.debian.org Vcs-* URLs
+ * Removed the duplicate Section field in debian/control
+
+ -- Emmanuel Bourg <ebo...@apache.org> Wed, 16 May 2018 16:02:36 +0200
+
java-gnome (4.1.3-7) unstable; urgency=medium
* Team upload.
@@ -195,7 +205,7 @@ java-gnome (4.0.14-2) unstable; urgency=low
* debian/patches/01_take_screenshots.diff
- Disable the file chooser dialog again as it still causes FTBFS on buildd.
- (Closes: #564494)
+ (Closes: #564494)
* debian/rules
- Add verbosity to build log if architecture is hppa. This will help us
track down cause of FTBFS on hppa.
@@ -266,7 +276,7 @@ java-gnome (4.0.13-1) unstable; urgency=low
-- Onkar Shinde <onkarshi...@ubuntu.com> Mon, 07 Sep 2009 12:29:11 +0530
java-gnome (4.0.12-1) unstable; urgency=low
-
+
[ Manu Mahajan ]
* Update to latest upstream release 4.0.12 (LP: #380446)
* Split the binary package into two separate packages for java and jni files
@@ -300,7 +310,7 @@ java-gnome (4.0.9-1) unstable; urgency=low
[ Hannes Wallnoefer ]
* New upstream release 4.0.9
- * Remove Cairo export patch, bug has been fixed upstream
+ * Remove Cairo export patch, bug has been fixed upstream
(Gnome bug #528282)
-- Hannes Wallnoefer <han...@helma.at> Wed, 03 Dec 2008 23:49:59 +0100
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -25,9 +25,9 @@ Build-Depends:
python,
xfonts-base,
xvfb
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/java-gnome.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/java-gnome.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/java-gnome.git
+Vcs-Browser: https://salsa.debian.org/java-team/java-gnome
Homepage: http://java-gnome.sourceforge.net/
Package: libjava-gnome-java
@@ -48,7 +48,6 @@ Description: Java-gnome language bindings project
This package contains the necessary JAR file.
Package: libjava-gnome-jni
-Section: java
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: libjava-gnome-java (<< 4.0.11)
=====================================
debian/patches/07_java10_compatibility.patch
=====================================
--- /dev/null
+++ b/debian/patches/07_java10_compatibility.patch
@@ -0,0 +1,65 @@
+--- a/configure
++++ b/configure
+@@ -417,6 +417,8 @@
+
+
+ sub check_jni_header_generator(\$$$$) {
++ return
++
+ my $scalarref = $_[0];
+ my $item = $_[1];
+ my $program = $_[2];
+@@ -2066,13 +2068,6 @@
+ HERE
+
+
+-if ($javah) {
+- print CONFIG "JAVAH=$javah\n";
+- print CONFIG "JAVAH_CMD=JAVAH \n";
+-} else {
+- bail "failed", "No JNI header generator detected.";
+-}
+-
+ if ($jar) {
+ print CONFIG "JAR=$jar\n";
+ print CONFIG "JAR_CMD=JAR \n";
+--- a/build/faster
++++ b/build/faster
+@@ -347,6 +347,7 @@
+
+ def compileJavaCode(outputDir, classpath, sourcepath, sources):
+ cmd = config['JAVAC'] + " "
++ cmd += "-h tmp/include "
+ cmd += "-d " + outputDir
+ if classpath:
+ cmd += " -classpath " + classpath
+@@ -612,7 +613,6 @@
+
+ makeJarFile()
+
+- generateHeaderFiles()
+ compileBindingsObjects()
+ linkSharedLibrary()
+
+--- a/src/bindings/org/gnome/glib/GBoxed.c
++++ b/src/bindings/org/gnome/glib/GBoxed.c
+@@ -34,7 +34,6 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ #include <jni.h>
+-#include "org_gnome_glib_GBoxed.h"
+
+ /*
+ * Implements
+--- a/src/generator/com/operationaldynamics/codegen/TypeGenerator.java
++++ b/src/generator/com/operationaldynamics/codegen/TypeGenerator.java
+@@ -161,6 +161,9 @@
+ out.print(objectType.bindingsClass);
+ out.print(" extends Plumbing\n{\n");
+
++ // Add at least one @Native field to ensure a native header is
generated for this class
++ out.print("@java.lang.annotation.Native static final byte
_JAVAH_HELPER_ = 0;\n");
++
+ out.print(" ");
+ out.print("private ");
+ out.print(objectType.bindingsClass);
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
04_translations.patch
05_ppc64el_configure.patch
06_disable_java_check.patch
+07_java10_compatibility.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,3 @@ override_dh_auto_build-arch:
$(DEB_MAKE_ENVVARS) dh_auto_build -- all
override_dh_auto_test:
-
-get-orig-source:
- uscan --force-download --rename
View it on GitLab:
https://salsa.debian.org/java-team/java-gnome/compare/a181081af452e24d2eba0db3892c6a76ecfd0ed5...d661bcc290e2eb8ec4608145fdd32d0c831b30ad
---
View it on GitLab:
https://salsa.debian.org/java-team/java-gnome/compare/a181081af452e24d2eba0db3892c6a76ecfd0ed5...d661bcc290e2eb8ec4608145fdd32d0c831b30ad
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
