[Git][java-team/electric][master] 5 commits: Address FTBFS on Java 17 (Closes: #1011554)

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / electric


Commits:
16ea0182 by tony mancill at 2022-05-28T12:24:27-07:00
Address FTBFS on Java 17 (Closes: #1011554)

- - - - -
5a1192e1 by tony mancill at 2022-05-28T12:24:45-07:00
Freshen years in debian/copyright

- - - - -
2c9b69c6 by tony mancill at 2022-05-28T12:25:46-07:00
Bump Standards-Version to 4.6.1

- - - - -
8a6fb244 by tony mancill at 2022-05-28T12:25:46-07:00
Prepare changelog for upload to unstable

- - - - -
77fe14d3 by tony mancill at 2022-05-28T12:29:38-07:00
whitespace

Gbp-Dch: ignore

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/02-java17.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+electric (9.07+dfsg-7) unstable; urgency=medium
+
+  * Team upload.
+  * Address FTBFS on Java 17 due to type inference (Closes: #1011554)
+  * Bump Standards-Version to 4.6.1
+
+ -- tony mancill <tmancill at debian.org>  Sat, 28 May 2022 12:25:17 -0700
+
 electric (9.07+dfsg-6) unstable; urgency=medium
 
   * Switch to debhelper-compat = 13.
@@ -362,6 +370,3 @@ electric (6.00-1) unstable; urgency=low
     directory (/usr/share/doc/electric/html)
 
  -- Chris Ruffin <cmruffin at debian.org>  Sat,  9 Sep 2000 16:50:25 -0400
-
-
-


=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends:
  jython,
  libjava3d-java,
  libslf4j-java
-Standards-Version: 4.5.0
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/electric.git
 Vcs-Browser: https://salsa.debian.org/java-team/electric
 Homepage: http://www.staticfreesoft.com/productsFree.html


=====================================
debian/copyright
=====================================
@@ -22,7 +22,8 @@ Copyright: 2000-2002, Chris Ruffin <cmruffin at debian.org>
            2008,      Ralf Treinen <treinen at debian.org>
            2008-2010, Onkar Shinde <onkarshinde at gmail.com>
            2011,      Torsten Werner <twerner at debian.org>
-           2014-2020, Markus Koschany <apo at debian.org>
+           2014-2022, Markus Koschany <apo at debian.org>
+           2022, tony mancill <tmancill at debian.org>
 License: GPL-3+
 
 License: GPL-3+


=====================================
debian/patches/02-java17.patch
=====================================
@@ -0,0 +1,15 @@
+Description: address FTBFS for Java 17 by bumping source version to Java 8
+Author: tony mancill <tmancill at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011554
+
+--- a/build.xml
++++ b/build.xml
+@@ -65,7 +65,7 @@
+ 
+ 	<target name="compile" description="Compile Electric">
+ 		<javac encoding="UTF-8" debug="true" includeantruntime="false" destdir="${antBuild}" srcdir="com"
+-			   fork="true" memoryMaximumSize="1024m" source="1.7" target="1.7">
++			   fork="true" memoryMaximumSize="1024m" source="1.8" target="1.8">
+ 			<classpath>
+                 <pathelement location="/usr/share/java/bsh.jar" />
+                 <pathelement location="/usr/share/java/vecmath.jar" />


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 build.patch
 java9.patch
+02-java17.patch



View it on GitLab: https://salsa.debian.org/java-team/electric/-/compare/2b54e826342435104f87d9fec71bec072c4870a0...77fe14d3c1d4f7cf3dd7a5968e9ef4e544132d68

-- 
View it on GitLab: https://salsa.debian.org/java-team/electric/-/compare/2b54e826342435104f87d9fec71bec072c4870a0...77fe14d3c1d4f7cf3dd7a5968e9ef4e544132d68
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/20220528/735fdb78/attachment.htm>