Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: resteasy...@packages.debian.org
Control: affects -1 + src:resteasy3.0

Please unblock package resteasy3.0

This update drops the dependency on libtomcat9-java
which won't be part of Bookworm (#1033366)

Thank you,

Emmanuel Bourg

unblock resteasy3.0/3.0.26-6
diff --git a/debian/changelog b/debian/changelog
index 68db1eab6..148149f7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+resteasy3.0 (3.0.26-6) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libservlet-api-java and libel-api-java instead of libtomcat9-java
+    (Closes: #1033366)
+
+ -- Emmanuel Bourg <ebo...@apache.org>  Sun, 14 May 2023 19:12:25 +0200
+
 resteasy3.0 (3.0.26-5) unstable; urgency=medium
 
   * patches: Replace javax/activation with jakarta/activation, fixes noise
diff --git a/debian/control b/debian/control
index bd18212da..47fdea4fd 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends-Indep:
  javahelper,
  junit4,
  libcommons-io-java,
+ libel-api-java,
  libgeronimo-annotation-1.3-spec-java,
  libhttpclient-java,
  libjackson2-core-java,
@@ -22,8 +23,8 @@ Build-Depends-Indep:
  libjboss-logging-java,
  libjboss-logging-tools-java,
  libmaven-install-plugin-java,
- libslf4j-java,
- libtomcat9-java,
+ libservlet-api-java,
+ libslf4j-java
 Standards-Version: 4.5.1
 Vcs-Git: https://salsa.debian.org/java-team/resteasy.git
 Vcs-Browser: https://salsa.debian.org/java-team/resteasy
diff --git a/debian/libresteasy3.0-java.classpath 
b/debian/libresteasy3.0-java.classpath
index 2dfc0599a..89a972771 100644
--- a/debian/libresteasy3.0-java.classpath
+++ b/debian/libresteasy3.0-java.classpath
@@ -1,2 +1,2 @@
-usr/share/java/resteasy-jaxrs.jar      /usr/share/java/slf4j-api.jar 
/usr/share/java/httpclient.jar /usr/share/java/commons-io.jar 
/usr/share/java/geronimo-annotation-1.3-spec.jar 
/usr/share/java/tomcat9-el-api.jar /usr/share/java/jakarta-activation.jar
+usr/share/java/resteasy-jaxrs.jar      /usr/share/java/slf4j-api.jar 
/usr/share/java/httpclient.jar /usr/share/java/commons-io.jar 
/usr/share/java/geronimo-annotation-1.3-spec.jar 
/usr/share/java/jakarta-activation.jar
 usr/share/java/resteasy-jackson2-provider.jar  
/usr/share/java/jackson-core.jar /usr/share/java/jackson-databind.jar 
/usr/share/java/jackson-jaxrs-base.jar 
/usr/share/java/jackson-jaxrs-json-provider.jar 
/usr/share/java/jackson-module-jaxb-annotations.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index 30c686e5e..51bec29df 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -12,7 +12,7 @@ org.yaml snakeyaml * s/.*/1.x/ * *
 com.sun.istack istack-commons-runtime * s/debian/2.17/ * *
 s/jboss/javassist/ javassist * s/.*/debian/ * *
 s/org.jboss.spec.javax.annotation/org.apache.geronimo.specs/ 
s/jboss-annotations-api_1.2_spec/geronimo-annotation_1.3_spec/ * s/.*/debian/ * 
*
-s/org.jboss.spec.javax.servlet/org.apache.tomcat/ 
s/jboss-servlet-api_3.1_spec/tomcat-servlet-api/ * s/.*/9.x/ * *
-s/org.jboss.spec.javax.el/org.apache.tomcat/ 
s/jboss-el-api_3.0_spec/tomcat-el-api/ * s/.*/9.x/ * *
+s/org.jboss.spec.javax.servlet/javax.servlet/ 
s/jboss-servlet-api_3.1_spec/javax.servlet-api/ * s/.*/debian/ * *
+s/org.jboss.spec.javax.el/javax.el/ s/jboss-el-api_3.0_spec/javax.el-api/ * 
s/.*/debian/ * *
 s/org.jboss.spec.javax.ws.rs/javax.ws.rs/ 
s/jboss-jaxrs-api_2.0_spec/javax.ws.rs-api/ * s/.*/debian/ * *
 s/javax.activation/jakarta.activation/ s/activation/jakarta.activation-api/ * 
s/.*/debian/ * *

Reply via email to