Control: retitle 1146376 trixie-pu: package tomcat-native/2.0.16-1~deb13u1

Hello,

El 11/11/26 a las 15:55, Bastien Roucaries escribió:
> Hi,
> 
> Newer [tomcat] version will need [tomcat-native] 2.0.16-1, so could you:
> - asses rdeps ?

    dak rm --suite=trixie -n -R tomcat-native
    Will remove the following packages from trixie:

    libtcnative-1 | 1.3.1-1+b1 | amd64, arm64, armel, armhf, i386, ppc64el, 
riscv64, s390x
    tomcat-native |    1.3.1-1 | source

    Maintainer: Debian Java Maintainers 
<[email protected]>

    ------------------- Reason -------------------

    ----------------------------------------------

    Checking reverse dependencies...
    # Broken Build-Depends:
    tomcat10: libtcnative-1 (1.2.35 >=)
    tomcat11: libtcnative-1 (1.2.35 >=)
    tomcat9: libtcnative-1 (1.2.18 >=)

    Dependency problem found.


And both tomcat10 and tomcat11 binary packages Recommends libtcnative-1.


> - prepare a backport of 2.0.16-1 ?

I was planning to do that in some months since upstream will maintain
1.3.x until 31 March 2027 (https://tomcat.apache.org/native-1.3-doc/),
but indeed, it sound better to do it from now.


Please note that tomcat-native 2.0.x builds libtcnative-2 instead of
libtcnative-1.  So that will require a new package in trixie, and
tomcat* would need to update their Build-Dependencies and Recommends
accordingly.

I've prepared a backport, and you have a Debusine workflow here:
https://debusine.debian.net/debian/developers/work-request/1614114/

Changes can be found at:
https://salsa.debian.org/santiago/tomcat-native/-/commits/wip/debian/trixie-2.0.x

For simplicity, here below you can find the changes in the debian/ dir
only compared to the current 1.3.1-1 version. Please let me know if you
prefer a full diff (Full diff also available at
https://debusine.debian.net/debian/developers/work-request/1614164/#output)

diff --git a/debian/changelog b/debian/changelog
index c4c7bcd..62ca9c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+tomcat-native (2.0.17-1~deb13u1) trixie; urgency=medium
+
+  * Team upload.
+  * Add dep-8 tests to check compatibility with tomcat 10 and 11
+
+ -- Santiago Ruano Rincón <[email protected]>  Fri, 13 Nov 2026 06:41:59 
+0100
+
+tomcat-native (2.0.17-1) unstable; urgency=medium
+
+  * New upstream release
+  * Removed the Priority field
+  * Converted debian/watch to the version 5 format
+
+ -- Emmanuel Bourg <[email protected]>  Tue, 10 Nov 2026 22:57:50 +0100
+
+tomcat-native (2.0.16-1) unstable; urgency=medium
+
+  * New upstream release
+  * Removed Damien Raude-Morvan from the Uploaders (Closes: #1143739)
+
+ -- Emmanuel Bourg <[email protected]>  Fri, 18 Sep 2026 12:07:33 +0200
+
+tomcat-native (2.0.14-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release (Closes: #1034492)
+    - Renamed libtcnative-1 to libtcnative-2
+  * Standards-Version updated to 4.7.4
+
+ -- Emmanuel Bourg <[email protected]>  Tue, 31 Mar 2026 23:36:38 +0200
+
+tomcat-native (1.3.7-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+
+ -- Emmanuel Bourg <[email protected]>  Mon, 16 Mar 2026 22:45:48 +0100
+
 tomcat-native (1.3.1-1) unstable; urgency=medium

   * Team upload.
diff --git a/debian/control b/debian/control
index f956237..66692e1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,19 @@
 Source: tomcat-native
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers 
<[email protected]>
-Uploaders: Damien Raude-Morvan <[email protected]>
+Uploaders: Emmanuel Bourg <[email protected]>
 Build-Depends:
  debhelper-compat (= 13),
  default-jdk,
  dpkg-dev (>= 1.16.1~),
  libapr1-dev,
  libssl-dev
-Standards-Version: 4.7.0
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/tomcat-native.git
 Vcs-Browser: https://salsa.debian.org/java-team/tomcat-native
 Homepage: http://tomcat.apache.org/native-doc/

-Package: libtcnative-1
+Package: libtcnative-2
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/libtcnative-1.lintian-overrides 
b/debian/libtcnative-1.lintian-overrides
deleted file mode 100644
index a836caf..0000000
--- a/debian/libtcnative-1.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libtcnative-1: non-dev-pkg-with-shlib-symlink
-libtcnative-1: package-name-doesnt-match-sonames libtcnative-1-0
diff --git a/debian/libtcnative-2.lintian-overrides 
b/debian/libtcnative-2.lintian-overrides
new file mode 100644
index 0000000..8029a56
--- /dev/null
+++ b/debian/libtcnative-2.lintian-overrides
@@ -0,0 +1,2 @@
+libtcnative-2: non-dev-pkg-with-shlib-symlink
+libtcnative-2: package-name-doesnt-match-sonames libtcnative-2-0
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..73f7ced
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,7 @@
+Tests: tomcat11-loads-apr
+Restrictions: needs-root
+Depends: @, tomcat11
+
+Tests: tomcat10-loads-apr
+Restrictions: needs-root
+Depends: @, tomcat10
diff --git a/debian/tests/tomcat10-loads-apr b/debian/tests/tomcat10-loads-apr
new file mode 100644
index 0000000..ed9de87
--- /dev/null
+++ b/debian/tests/tomcat10-loads-apr
@@ -0,0 +1,15 @@
+#!/usr/bin/sh
+
+# See https://bugs.debian.org/1143583
+
+systemctl start tomcat10.service
+sleep 5
+systemctl status tomcat10.service
+
+echo "checking for incompatibility messages"
+
+ret=$(grep "SEVERE.*An incompatible version.*of the Apache Tomcat Native 
library is installed" /var/log/tomcat10/catalina* || true)
+if [ "$ret" ]; then
+    printf >&2 "Error: $ret"
+    false
+fi
diff --git a/debian/tests/tomcat11-loads-apr b/debian/tests/tomcat11-loads-apr
new file mode 100644
index 0000000..8e997b7
--- /dev/null
+++ b/debian/tests/tomcat11-loads-apr
@@ -0,0 +1,15 @@
+#!/usr/bin/sh
+
+# See https://bugs.debian.org/1143583
+
+systemctl start tomcat11.service
+sleep 5
+systemctl status tomcat11.service
+
+echo "checking for incompatibility messages"
+
+ret=$(grep "SEVERE.*An incompatible version.*of the Apache Tomcat Native 
library is installed" /var/log/tomcat11/catalina* || true)
+if [ "$ret" ]; then
+    printf >&2 "Error: $ret"
+    false
+fi
diff --git a/debian/watch b/debian/watch
index 7f23944..2deab7a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,5 @@
-version=4
-opts="repack,compression=xz" \
-https://archive.apache.org/dist/tomcat/tomcat-connectors/native/([\d\.]+)/source/tomcat-native-([\d\.]+)-src\.tar\.gz
 debian uupdate
+Version: 5
+Source: 
https://archive.apache.org/dist/tomcat/tomcat-connectors/native/@ANY_VERSION@/source/
+Matching-Pattern: tomcat-native-@ANY_VERSION@-src\.tar\.gz
+Repack: yes
+Compression: xz


Thanks!

 -- Santiago

Attachment: signature.asc
Description: PGP signature

Reply via email to