[Git][java-team/jython][master] 3 commits: Adjusted the Vcs-* fields

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jython


Commits:
a5b2eb2a by Emmanuel Bourg at 2019-08-08T08:07:48Z
Adjusted the Vcs-* fields

- - - - -
86c44615 by Emmanuel Bourg at 2019-08-08T08:11:19Z
Preserve the backward compatibility with Java 7 (Closes: #934111)

- - - - -
a4df6fa3 by Emmanuel Bourg at 2019-08-08T08:11:28Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/08-java-backward-compatibility.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jython (2.7.1+repack1-4) unstable; urgency=medium
+
+  * Team upload.
+  * Preserve the backward compatibility with Java 7 (Closes: #934111)
+  * Adjusted the Vcs-* fields
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 08 Aug 2019 10:11:23 +0200
+
 jython (2.7.1+repack1-3) unstable; urgency=medium
 
   * Improve previous fix with default-jre-headless (>= 2:1.9), thanks to


=====================================
debian/control
=====================================
@@ -25,14 +25,14 @@ Build-Depends-Indep: default-jdk,
  libicu4j-java,
  libnetty-java
 Standards-Version: 4.2.1
-Vcs-Git: https://salsa.debian.org/java-team/jython
-Vcs-Browser: https://salsa.debian.org/java-team/jython.git
+Vcs-Git: https://salsa.debian.org/java-team/jython.git
+Vcs-Browser: https://salsa.debian.org/java-team/jython
 Homepage: http://www.jython.org
 
 Package: jython
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, ${java:Depends},
- default-jre-headless (>= 2:1.9) | java9-runtime-headless,
+ default-jre-headless (>= 2:1.7) | java7-runtime-headless,
 Recommends: default-jdk | java-compiler
 Suggests: jython-doc, libmariadb-java, libpostgresql-jdbc-java
 Description: Python seamlessly integrated with Java


=====================================
debian/patches/08-java-backward-compatibility.patch
=====================================
@@ -0,0 +1,45 @@
+Description: Preserves the backward compatibility with previous Java versions when built with Java 11+
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not
+--- a/build.xml
++++ b/build.xml
+@@ -436,6 +436,7 @@
+                 destdir="${compile.dir}"
+                 target="${jdk.target.version}"
+                 source="${jdk.source.version}"
++                release="${jdk.target.version}"
+                 debug="${debug}"
+                 deprecation="${deprecation}"
+                 nowarn="${nowarn}">
+@@ -483,6 +484,7 @@
+         <javac destdir="${compile.dir}"
+                target="${jdk.target.version}"
+                source="${jdk.source.version}"
++               release="${jdk.target.version}"
+                debug="${debug}"
+                deprecation="${deprecation}"
+                nowarn="${nowarn}"
+@@ -502,6 +504,7 @@
+                destdir="${compile.dir}"
+                target="${jdk.target.version}"
+                source="${jdk.source.version}"
++               release="${jdk.target.version}"
+                debug="${debug}"
+                deprecation="${deprecation}"
+                nowarn="${nowarn}">
+@@ -513,6 +516,7 @@
+                destdir="${compile.dir}"
+                target="${jdk.target.version}"
+                source="${jdk.source.version}"
++               release="${jdk.target.version}"
+                debug="${debug}"
+                deprecation="${deprecation}"
+                nowarn="${nowarn}"
+@@ -882,6 +886,7 @@
+                destdir="${compile.dir}"
+                target="${jdk.target.version}"
+                source="${jdk.source.version}"
++               release="${jdk.target.version}"
+                debug="${debug}"
+                deprecation="${deprecation}"
+                nowarn="${nowarn}"


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@
 05-no-com.carrotsearch.sizeof.patch
 javadoc-classpath.patch
 reproducible-builds.patch
+08-java-backward-compatibility.patch


=====================================
debian/rules
=====================================
@@ -74,6 +74,7 @@ override_dh_auto_build:
 	# Build the class files.
 	# -nouserlib is required to prevent conflicts with the ant jython plugin
 	ant -nouserlib developer-build jar javadoc \
+	  -Djython.java.version=7 \
 	  -Dmain.classpath=$(OUR_MAIN_CLASSPATH) \
 	  -Dtest.classpath=$(OUR_TEST_CLASSPATH) \
 	  -Druntime.classpath="$(OUR_RUNTIME_CLASSPATH)"



View it on GitLab: https://salsa.debian.org/java-team/jython/compare/a295fa6c3360263201f71855eb787cd16ba94c16...a4df6fa372d413bb6550fbf95cff9be2c0c7c9a9

-- 
View it on GitLab: https://salsa.debian.org/java-team/jython/compare/a295fa6c3360263201f71855eb787cd16ba94c16...a4df6fa372d413bb6550fbf95cff9be2c0c7c9a9
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/20190808/00a8b08f/attachment.html>