[Git][java-team/librdfa-java][master] 8 commits: Declare compliance with Debian Policy 4.6.2.

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / librdfa-java


Commits:
81cb77ea by Markus Koschany at 2023-01-09T23:08:35+01:00
Declare compliance with Debian Policy 4.6.2.

- - - - -
a06e366a by Markus Koschany at 2023-01-09T23:08:52+01:00
Update copyright years

- - - - -
3e43c732 by Markus Koschany at 2023-01-09T23:14:46+01:00
Build-depend on liblog4j1.2-java instead of liblog4j2-java.

- - - - -
cb8e2f59 by Markus Koschany at 2023-01-09T23:16:33+01:00
Also depend on liblog4j2-java.

- - - - -
4319dbb5 by Markus Koschany at 2023-01-10T00:15:21+01:00
Tighten B-D on libapache-jena-java.

- - - - -
7fcfa61e by Markus Koschany at 2023-01-10T00:17:07+01:00
Add RDFaReader.patch

- - - - -
eec68ad8 by Markus Koschany at 2023-01-10T13:58:34+01:00
Update changelog and patch header

- - - - -
088df6f0 by Markus Koschany at 2023-01-10T14:01:16+01:00
Remove librdfa-java.lintian-overrides

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/copyright
- − debian/librdfa-java.lintian-overrides
- debian/maven.rules
- + debian/patches/RDFaReader.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+librdfa-java (1.0.0~BETA1-3) unstable; urgency=medium
+
+  * Declare compliance with Debian Policy 4.6.2.
+  * Tighten B-D on libapache-jena-java.
+  * Add RDFaReader.patch and fix FTBFS with Apache Jena 4.5.0.
+    (Closes: #1022378)
+
+ -- Markus Koschany <apo at debian.org>  Tue, 10 Jan 2023 13:55:03 +0100
+
 librdfa-java (1.0.0~BETA1-2) unstable; urgency=medium
 
   * Source-only rebuild.


=====================================
debian/control
=====================================
@@ -7,13 +7,14 @@ Uploaders:
 Build-Depends:
  debhelper-compat (= 13),
  default-jdk,
- libapache-jena-java,
+ libapache-jena-java (>= 4.5.0-2~),
  libhtml5parser-java,
+ liblog4j1.2-java,
  liblog4j2-java,
  libmaven-bundle-plugin-java,
  libslf4j-java,
  maven-debian-helper
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/librdfa-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/librdfa-java
 Homepage: https://github.com/iteggmbh/java-rdfa


=====================================
debian/copyright
=====================================
@@ -7,7 +7,7 @@ Copyright: 2009,2010, The University of Bristol
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2021, Markus Koschany <apo at debian.org>
+Copyright: 2021-2023, Markus Koschany <apo at debian.org>
 License: BSD-3-clause
 
 License: BSD-3-clause


=====================================
debian/librdfa-java.lintian-overrides deleted
=====================================
@@ -1,2 +0,0 @@
-# This is intentional because the jar is only a wrapper
-codeless-jar usr/share/java/java-rdfa-htmlparser.jar


=====================================
debian/maven.rules
=====================================
@@ -6,3 +6,4 @@ org.apache.maven.shared maven-plugin-testing-harness * * * *
 org.apache.rat apache-rat-plugin * * * *
 org.codehaus.plexus plexus-container-default * * * *
 s/nu.validator/nu.validator.htmlparser/ htmlparser * s/.*/debian/ * *
+log4j log4j jar s/1\.2\..*/1.2.x/


=====================================
debian/patches/RDFaReader.patch
=====================================
@@ -0,0 +1,33 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 10 Jan 2023 00:16:59 +0100
+Subject: RDFaReader
+
+Compatibility patch with Apache Jena 4.5.0 in Debian.
+
+Bug-Debian: https://bugs.debian.org/1022378
+---
+ rdfa-module/src/main/java/net/rootdev/javardfa/jena/RDFaReader.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rdfa-module/src/main/java/net/rootdev/javardfa/jena/RDFaReader.java b/rdfa-module/src/main/java/net/rootdev/javardfa/jena/RDFaReader.java
+index 2fa52af..84bc233 100644
+--- a/rdfa-module/src/main/java/net/rootdev/javardfa/jena/RDFaReader.java
++++ b/rdfa-module/src/main/java/net/rootdev/javardfa/jena/RDFaReader.java
+@@ -7,7 +7,7 @@ package net.rootdev.javardfa.jena;
+ 
+ import org.apache.jena.rdf.model.Model;
+ import org.apache.jena.rdf.model.RDFErrorHandler;
+-import org.apache.jena.rdf.model.RDFReader;
++import org.apache.jena.rdf.model.RDFReaderI;
+ import org.apache.jena.rdf.model.impl.RDFReaderFImpl;
+ import java.io.IOException;
+ import java.io.InputStream;
+@@ -24,7 +24,7 @@ import org.xml.sax.XMLReader;
+  * @author Damian Steer <pldms at mac.com>
+  */
+ 
+-public class RDFaReader implements RDFReader {
++public class RDFaReader implements RDFReaderI {
+ 
+     static {
+         RDFReaderFImpl.setBaseReaderClassName("HTML", HTMLRDFaReader.class.getName());


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 htmlparser-module.patch
 pom-modules.patch
 add-profile-support.patch
+RDFaReader.patch



View it on GitLab: https://salsa.debian.org/java-team/librdfa-java/-/compare/3adee4ff73f3a28ddcba36ce5827a38ac5fa234f...088df6f044ed908bf4b46ccdf4e6fbe1582f8568

-- 
View it on GitLab: https://salsa.debian.org/java-team/librdfa-java/-/compare/3adee4ff73f3a28ddcba36ce5827a38ac5fa234f...088df6f044ed908bf4b46ccdf4e6fbe1582f8568
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/20230110/938bdddf/attachment.htm>