Emmanuel Bourg pushed to branch master at Debian Java Maintainers / antlr4
Commits:
9c6d71e1 by Emmanuel Bourg at 2021-02-07T23:49:44+01:00
No longer link the javadoc with libjs-jquery (Closes: #981992)
- - - - -
f4543c07 by Emmanuel Bourg at 2021-02-07T23:52:03+01:00
Replaced the json-api patch with a Maven rule
- - - - -
570f902a by Emmanuel Bourg at 2021-02-07T23:52:27+01:00
Upload to unstable
- - - - -
7 changed files:
- − debian/antlr4-doc.links
- debian/changelog
- debian/control
- debian/maven.rules
- − debian/patches/0004-Switch-to-javax.json-api.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/antlr4-doc.links deleted
=====================================
@@ -1,5 +0,0 @@
-usr/share/javascript/jquery/jquery.js
usr/share/doc/antlr4/api/jquery/external/jquery/jquery.js
-usr/share/javascript/jquery-ui/themes/base/jquery-ui.css
usr/share/doc/antlr4/api/jquery/jquery-ui.css
-usr/share/javascript/jquery-ui/jquery-ui.js
usr/share/doc/antlr4/api/jquery/jquery-ui.js
-usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css
usr/share/doc/antlr4/api/jquery/jquery-ui.min.css
-usr/share/javascript/jquery-ui/jquery-ui.min.js
usr/share/doc/antlr4/api/jquery/jquery-ui.min.js
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+antlr4 (4.7.2-5) unstable; urgency=medium
+
+ * No longer link the javadoc with libjs-jquery (Closes: #981992)
+ * Replaced the json-api patch with a Maven rule
+
+ -- Emmanuel Bourg <ebo...@apache.org> Sun, 07 Feb 2021 23:52:11 +0100
+
antlr4 (4.7.2-4) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -46,10 +46,7 @@ Description: ANTLR Parser Generator
Package: antlr4-doc
Architecture: all
Section: doc
-Depends: default-jdk-doc,
- libjs-jquery,
- libjs-jquery-ui,
- ${misc:Depends}
+Depends: default-jdk-doc, ${misc:Depends}
Suggests: libantlr4-runtime-java
Description: ANTLR Parser Generator (documentation)
ANTLR (ANother Tool for Language Recognition) is a powerful parser generator
=====================================
debian/maven.rules
=====================================
@@ -8,3 +8,4 @@ s/org.apache.maven.shared/org.apache.maven.plugin-testing/
maven-test-tools * s/
org.apache.maven maven-compat * s/.*/3.x/ * *
org.apache.maven maven-plugin-api * s/.*/3.x/ * *
org.apache.maven s/maven-project/maven-core/ * s/.*/3.x/ * *
+s/org.glassfish/javax.json/ s/javax.json/javax.json-api/ * s/.*/debian/ * *
=====================================
debian/patches/0004-Switch-to-javax.json-api.patch deleted
=====================================
@@ -1,25 +0,0 @@
-From: Jochen Sprickerhof <jspri...@debian.org>
-Date: Fri, 22 Jan 2021 11:03:47 +0100
-Subject: Switch to javax.json-api
-
----
- tool/pom.xml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/pom.xml b/tool/pom.xml
-index 82c7fb8..9af87e0 100644
---- a/tool/pom.xml
-+++ b/tool/pom.xml
-@@ -37,9 +37,9 @@
- <version>1.0.3</version>
- </dependency>
- <dependency>
-- <groupId>org.glassfish</groupId>
-- <artifactId>javax.json</artifactId>
-- <version>1.0.4</version>
-+ <groupId>javax.json</groupId>
-+ <artifactId>javax.json-api</artifactId>
-+ <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
02-ignore-modules.patch
fix-unicodedata.st.patch
icu4j-compatibility.patch
-0004-Switch-to-javax.json-api.patch
=====================================
debian/rules
=====================================
@@ -10,11 +10,6 @@ override_dh_auto_build:
cp -r debian/generated-sources/antlr4/* runtime/Java/src/
dh_auto_build
-override_dh_install:
- dh_install
- ln -fs ../../../../javascript/jquery/jquery.js \
- debian/antlr4-doc/usr/share/doc/antlr4/api/jquery/jquery-?.*
-
override_dh_auto_clean:
dh_auto_clean
View it on GitLab:
https://salsa.debian.org/java-team/antlr4/-/compare/a9205c1626d80a54da315c1dcf3fb1056a456913...570f902a5ae8d32025269be39190486642beebb0
--
View it on GitLab:
https://salsa.debian.org/java-team/antlr4/-/compare/a9205c1626d80a54da315c1dcf3fb1056a456913...570f902a5ae8d32025269be39190486642beebb0
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
