debian/changelog

+undertow (1.4.25-2) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libgeronimo-annotation-1.3-spec-java and libservlet3.1-java
+    instead of libtomcat8-java
+  * Standards-Version updated to 4.2.1
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 03 Dec 2018 22:37:39 +0100
+
 undertow (1.4.25-1) unstable; urgency=medium
 
   * New upstream version 1.4.25

debian/control

@@ -10,6 +10,7 @@ Build-Depends:
  default-jdk-doc,
  libapacheds-java,
  libeasymock-java,
+ libgeronimo-annotation-1.3-spec-java,
  libh2-java (>= 1.3.175),
  libhttpclient-java,
  libhttpmime-java,
@@ -28,11 +29,11 @@ Build-Depends:
  libmaven-javadoc-plugin-java,
  libmaven-shade-plugin-java,
  libnetty-java,
- libtomcat8-java,
+ libservlet3.1-java,
  maven-debian-helper (>= 1.5)
-Standards-Version: 4.1.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/undertow.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/undertow.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/undertow.git
+Vcs-Browser: https://salsa.debian.org/java-team/undertow
 Homepage: http://undertow.io/
 
 Package: libundertow-java

debian/maven.rules

@@ -15,9 +15,9 @@ org.jboss.logmanager jboss-logmanager jar s/.*/debian/ * *
 org.jboss.xnio xnio-api jar s/.*/debian/ * *
 org.jboss.xnio xnio-nio jar s/.*/debian/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *
-s/org\.jboss\.spec\.javax\.annotation/org.apache.tomcat/ s/jboss-annotations-api_1.2_spec/tomcat-annotations-api/ jar s/.*/8.x/ * *
-s/org\.jboss\.spec\.javax\.servlet/org.apache.tomcat/ s/jboss-servlet-api_3.1_spec/tomcat-servlet-api/ jar s/.*/8.x/ * *
-s/org\.jboss\.spec\.javax\.websocket/org.apache.tomcat/ s/jboss-websocket-api_1.1_spec/tomcat-websocket-api/ jar s/.*/8.x/ * *
+s/org\.jboss\.spec\.javax\.annotation/org.apache.geronimo.specs/ s/jboss-annotations-api_1.2_spec/geronimo-annotation_1.3_spec/ jar s/.*/debian/ * *
+s/org\.jboss\.spec\.javax\.servlet/javax.servlet/    s/jboss-servlet-api_3.1_spec/javax.servlet-api/ jar s/.*/3.1/ * *
+s/org\.jboss\.spec\.javax\.websocket/javax.websocket/  s/jboss-websocket-api_1.1_spec/javax.websocket-api/ jar s/.*/1.0/ * *
 io.netty netty-all * s/.*/debian/ * *
 org.apache.directory.server apacheds-all * s/.*/debian * *
-s/javax.annotation/org.apache.tomcat/ s/javax.annotation-api/tomcat-annotations-api/ * s/.*/8.x/ * *
+s/javax.annotation/org.apache.geronimo.specs/ s/javax.annotation-api/geronimo-annotation_1.3_spec/ * s/.*/debian/ * *

debian/rules

@@ -6,6 +6,3 @@
 override_dh_auto_test:
 	# Do nothing here to prevent a FTBFS due to a bug in maven-compiler-plugin
 	# 3.2. See also https://bugs.debian.org/808691
-
-get-orig-source:
-	uscan --verbose --repack --compression xz --download-current-version --force-download