[Git][java-team/libjt400-java][master] 10 commits: Add patch to complie on Java 17 (Closes: #1026617)
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Wed Dec 21 21:06:50 GMT 2022
Tony Mancill pushed to branch master at Debian Java Maintainers / libjt400-java
Commits:
951604f3 by tony mancill at 2022-12-21T12:37:31-08:00
Add patch to complie on Java 17 (Closes: #1026617)
Thank you to Hans Joachim Desserud <debian at desserud.org> for the patch.
- - - - -
5f47fa46 by tony mancill at 2022-12-21T13:02:42-08:00
Add lintian overrides
- - - - -
6665ece8 by tony mancill at 2022-12-21T13:02:42-08:00
Update Vcs URLs to point to Salsa
- - - - -
3109ca25 by tony mancill at 2022-12-21T13:02:42-08:00
Replace build-dep on libservlet3.1-java with libservlet-api-java
- - - - -
a2f169e5 by tony mancill at 2022-12-21T13:02:42-08:00
Use debhelper-compat (=13)
- - - - -
3b7b2c72 by tony mancill at 2022-12-21T13:02:42-08:00
Update Homepage URL
- - - - -
cf569fcf by tony mancill at 2022-12-21T13:02:42-08:00
Freshen years in debian/copyright
- - - - -
d4bf81c7 by tony mancill at 2022-12-21T13:02:42-08:00
Remove get-orig-source target from debian/rules
- - - - -
6cd4394a by tony mancill at 2022-12-21T13:02:42-08:00
Bump Standards-Version to 4.6.2
- - - - -
a8df1339 by tony mancill at 2022-12-21T13:02:42-08:00
Prepare changelog for upload to unstable
- - - - -
8 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/fix_ambiguous_record_import.patch
- debian/patches/series
- debian/rules
- + debian/source/lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+libjt400-java (9.4-2) unstable; urgency=medium
+
+ * Team upload
+ * Add patch to complie on Java 17 (Closes: #1026617)
+ Thank you to Hans Joachim Desserud <debian at desserud.org> for the patch.
+ * Add lintian overrides
+ * Update Vcs URLs to point to Salsa
+ * Replace build-dep on libservlet3.1-java with libservlet-api-java
+ * Use debhelper-compat (=13)
+ * Update Homepage URL
+ * Remove get-orig-source target from debian/rules
+ * Bump Standards-Version to 4.6.2
+
+ -- tony mancill <tmancill at debian.org> Wed, 21 Dec 2022 13:00:05 -0800
+
libjt400-java (9.4-1) unstable; urgency=medium
* Team upload
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -3,12 +3,15 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Julián Moreno Patiño <julian at debian.org>, Luca Vercelli <luca.vercelli.to at gmail.com>
-Build-Depends: debhelper (>= 9)
-Build-Depends-Indep: ant, default-jdk (>= 2:1.8-55), libservlet3.1-java, maven-repo-helper
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjt400-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjt400-java.git
-Homepage: http://jt400.sourceforge.net/
+Build-Depends: debhelper-compat (= 13)
+Build-Depends-Indep: ant,
+ default-jdk (>= 2:1.8-55),
+ libservlet-api-java,
+ maven-repo-helper
+Standards-Version: 4.6.2
+Vcs-Git: https://salsa.debian.org/java-team/libjt400-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libjt400-java
+Homepage: https://jt400.sourceforge.net/
Package: libjt400-java
Architecture: all
=====================================
debian/copyright
=====================================
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: jt400
-Source: http://jt400.sourceforge.net/
+Source: https://jt400.sourceforge.net/
Files: *
Copyright: 1996-2016 International Business Machines Corporation and others
@@ -9,6 +9,7 @@ License: CPL-1.0
Files: debian/*
Copyright: 2016 Julián Moreno Patiño <julian at debian.org>
2016 Luca Vercelli <luca.vercelli.to at gmail.com>
+ 2018-2022 tony mancill <tmancill at debian.org>
License: GPL-2+
License: GPL-2+
=====================================
debian/patches/fix_ambiguous_record_import.patch
=====================================
@@ -0,0 +1,29 @@
+Description: Explicit import for Record
+
+Since this code predates java.lang.Record in the JDK, I'm going to assume
+it refers to its own class
+
+---
+Forwarded: no
+Last-Update: 2022-12-21
+
+--- a/src/com/ibm/as400/data/RecordFormatDocument.java
++++ b/src/com/ibm/as400/data/RecordFormatDocument.java
+@@ -14,6 +14,7 @@
+ package com.ibm.as400.data;
+
+ import com.ibm.as400.access.*;
++import com.ibm.as400.access.Record;
+
+ import java.io.File;
+ import java.io.FileOutputStream;
+--- a/src/com/ibm/as400/data/RfmlRecordFormat.java
++++ b/src/com/ibm/as400/data/RfmlRecordFormat.java
+@@ -26,6 +26,7 @@
+ import java.util.Vector;
+
+ import com.ibm.as400.access.*;
++import com.ibm.as400.access.Record;
+
+
+ /**
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
file_encoding.patch
+fix_ambiguous_record_import.patch
=====================================
debian/rules
=====================================
@@ -9,7 +9,7 @@ VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | s
override_dh_auto_clean:
ant -Dbuild=. clean
#remove files not cleaned by ant
- rm -rf include/servlet.jar java8/ jdbc42/
+ rm -rf include/servlet-api.jar java8/ jdbc42/
#remove code that depend of non-free code (because we don't have jui400.jar)
rm -rf */com/ibm/as400/vaccess
rm -rf */utilities/VRunJavaApplication.java
@@ -21,10 +21,6 @@ override_dh_auto_build:
#this build the ant task required by ant
cd build && javac -cp /usr/share/java/ant.jar *.java
#link required libraries
- ln -s /usr/share/java/servlet-api-3.1.jar include/servlet.jar
+ ln -s /usr/share/java/servlet-api.jar include/servlet.jar
#run ant
ant -lib .:./build jar8 -Dbuild=. -Djdk18=/usr
-
-get-orig-source:
- uscan --repack --rename --force-download --compression=xz \
- --upstream-version $(VERSION) --verbose
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# upstream sources contain HTML with long lines
+libjt400-java source: source-is-missing [changes.html]
+libjt400-java source: source-is-missing [license.html]
View it on GitLab: https://salsa.debian.org/java-team/libjt400-java/-/compare/80d0c716040ad5dbe3507729d2f4084fbda80789...a8df1339b7e68e5ca1311d6377e5bfca5352ceae
--
View it on GitLab: https://salsa.debian.org/java-team/libjt400-java/-/compare/80d0c716040ad5dbe3507729d2f4084fbda80789...a8df1339b7e68e5ca1311d6377e5bfca5352ceae
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/20221221/dd839427/attachment.htm>
More information about the pkg-java-commits
mailing list