[Git][java-team/jython][master] 4 commits: Remove deprecated lintian overrides

[Gilles Filippini (@pini)]

Gilles Filippini pushed to branch master at Debian Java Maintainers / jython


Commits:
62c74d1e by Gilles Filippini at 2021-09-28T22:52:26+02:00
Remove deprecated lintian overrides

- - - - -
4ca82333 by Gilles Filippini at 2021-09-28T23:24:59+02:00
Build-Depends: libservlet-api-java

instead of deprecated libservlet3.1-java

- - - - -
bccbfa3a by Gilles Filippini at 2021-09-28T23:36:25+02:00
Build-Depends: antlr3 (instead of antlr3.2)

- - - - -
ddf95aa5 by Gilles Filippini at 2021-09-28T23:55:27+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- − debian/source.lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+jython (2.7.2+repack1-4) unstable; urgency=medium
+
+  * Build-Depends: antlr3 (instead of antlr3.2; Closes: #995188)
+  * Build-Depends: libservlet-api-java (instead of deprecated
+    libservlet3.1-java)
+  * Remove deprecated lintien overrides
+
+ -- Gilles Filippini <pini at debian.org>  Tue, 28 Sep 2021 23:55:02 +0200
+
 jython (2.7.2+repack1-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10), dh-exec, ant, gawk, maven-repo-helper, javahel
 Build-Depends-Indep: default-jdk,
  dh-python,
  junit4,
- antlr3.2,
+ antlr3,
  bnd (>= 2.1.0),
  zip,
  libasm-java,
@@ -21,7 +21,7 @@ Build-Depends-Indep: default-jdk,
  libjnr-x86asm-java,
  libmariadb-java,
  libpostgresql-jdbc-java,
- libservlet3.1-java,
+ libservlet-api-java,
  libcommons-compress-java,
  libicu4j-java,
  libnetty-java


=====================================
debian/rules
=====================================
@@ -32,14 +32,15 @@ their_to_our = $(shell \
   sed -r 's/jline-.*\.jar/jline2.jar/' | \
   sed -r 's/junit-.*\.jar/junit4.jar/' | \
   sed -r 's/(netty-.*)-.*\.jar/\1.jar/' | \
-  sed -r 's/(servlet-api)-.*\.jar/\1-3.1.jar/' | \
   sed -r 's/(mysql-connector-java)-.*\.jar/mariadb-java-client.jar/' | \
   sed -r 's/(postgresql)-.*\.jar/\1.jar/' | \
   sed -r 's/(guava)-.*.jar/\1.jar/' | \
-  sed -r '/netty|servlet-api/!s/(java\/.*)-[0-9\._]*\.jar/\1.jar/' | \
-  sed -r 's/antlr(-.*)?\.jar/antlr3\1-3.2.jar/' | \
+  sed -r 's/(stringtemplate).jar/\14.jar/' | \
+  sed -r 's/antlr(-.*)?-3\..*\.jar/antlr3\1.jar/' | \
+  sed -r '/antlrall/d' | \
   sed -r '/java-sizeof/d' | \
   sed -r '/failureaccess/d' | \
+  sed -r '/antlr|netty/!s/(java\/.*)-[0-9\._]*\.jar/\1.jar/' | \
   xargs echo | \
   sed 's/ /:/g' \
 )


=====================================
debian/source.lintian-overrides deleted
=====================================
@@ -1,2 +0,0 @@
-jython source: cvsignore-file-in-source
-jython source: source-contains-CVS-dir



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

-- 
View it on GitLab: https://salsa.debian.org/java-team/jython/-/compare/e24c7e7b1d3599ffafb68200701989908facb5e0...ddf95aa5f52f6585e66d97174e7f638dc96fa543
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/20210928/f30a1c14/attachment.htm>