diff -Nru libcommons-dbcp-java-1.4/debian/changelog libcommons-dbcp-java-1.4/debian/changelog
--- libcommons-dbcp-java-1.4/debian/changelog	2020-06-22 10:18:12.000000000 +0000
+++ libcommons-dbcp-java-1.4/debian/changelog	2023-02-13 14:02:56.000000000 +0000
@@ -1,3 +1,12 @@
+libcommons-dbcp-java (1.4-8) unstable; urgency=medium
+
+  * Depend on libtomcat10-java instead of libtomcat9-java
+  * Removed the -java-doc package
+  * Standards-Version updated to 4.6.2
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 13 Feb 2023 15:02:56 +0100
+
 libcommons-dbcp-java (1.4-7) unstable; urgency=medium
 
   * Depend on libgeronimo-jta-1.2-spec-java
diff -Nru libcommons-dbcp-java-1.4/debian/control libcommons-dbcp-java-1.4/debian/control
--- libcommons-dbcp-java-1.4/debian/control	2020-06-22 10:08:17.000000000 +0000
+++ libcommons-dbcp-java-1.4/debian/control	2023-02-13 13:52:34.000000000 +0000
@@ -4,17 +4,14 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
 Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  default-jdk,
- default-jdk-doc,
  junit,
  libcommons-pool-java,
- libcommons-pool-java-doc,
  libgeronimo-jta-1.2-spec-java,
- libmaven-javadoc-plugin-java,
- libtomcat9-java,
+ libtomcat10-java,
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.5.0
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/libcommons-dbcp-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libcommons-dbcp-java
 Homepage: http://commons.apache.org/dbcp/
@@ -22,7 +19,7 @@
 Package: libcommons-dbcp-java
 Architecture: all
 Depends: ${maven:Depends}, ${misc:Depends}
-Suggests: libcommons-dbcp-java-doc, ${maven:OptionalDepends}
+Suggests: ${maven:OptionalDepends}
 Description: Database Connection Pooling Services
  The DBCP package provides database connection pooling services. The
  following features are supported
@@ -36,25 +33,3 @@
   * XML configuration.
  .
  This is a part of the Apache Commons Project.
-
-Package: libcommons-dbcp-java-doc
-Architecture: all
-Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
-Recommends: ${maven:DocOptionalDepends}
-Suggests: libcommons-dbcp-java
-Description: Database Connection Pooling Services - documentation
- The DBCP package provides database connection pooling services. The
- following features are supported
- .
-  * DataSource and Driver interfaces to the pool.
-  * Support for arbitrary sources of the underlying Connections.
-  * Integration with arbitrary org.apache.commons.pool.ObjectPool
-    implementations.
-  * Support for Connection validation, expiration, etc.
-  * Support for PreparedStatement pooling.
-  * XML configuration.
- .
- This is a part of the Apache Commons Project.
- .
- This package contains Javadoc API Documentation of Commons DBCP.
diff -Nru libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.doc-base.api libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.doc-base.api
--- libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.doc-base.api	2018-12-03 21:41:33.000000000 +0000
+++ libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.doc-base.api	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-Document: libcommons-dbcp-java
-Title: API Javadoc for Commons DBCP
-Author: Commons DBCP developers
-Abstract: This is the API Javadoc provided for the
- libcommons-dbcp-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libcommons-dbcp-java/api/index.html
-Files: /usr/share/doc/libcommons-dbcp-java/api/*
diff -Nru libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.install libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.install
--- libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.install	2018-12-03 21:42:54.000000000 +0000
+++ libcommons-dbcp-java-1.4/debian/libcommons-dbcp-java-doc.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-target/apidocs/* usr/share/doc/libcommons-dbcp-java/api
-
diff -Nru libcommons-dbcp-java-1.4/debian/maven.rules libcommons-dbcp-java-1.4/debian/maven.rules
--- libcommons-dbcp-java-1.4/debian/maven.rules	2020-06-22 10:14:06.000000000 +0000
+++ libcommons-dbcp-java-1.4/debian/maven.rules	2023-02-13 13:52:42.000000000 +0000
@@ -18,5 +18,5 @@
 
 commons-dbcp commons-dbcp jar s/.*/debian/ * *
 junit junit jar s/.*/3.x/ * *
-s/tomcat/org.apache.tomcat/ s/naming-common/tomcat-catalina/ * s/.*/9.x/ * *
+s/tomcat/org.apache.tomcat/ s/naming-common/tomcat-catalina/ * s/.*/10.x/ * *
 org.apache.geronimo.specs s/geronimo-jta_1.1_spec/geronimo-jta_1.2_spec/ * s/.*/debian/ * *
diff -Nru libcommons-dbcp-java-1.4/debian/watch libcommons-dbcp-java-1.4/debian/watch
--- libcommons-dbcp-java-1.4/debian/watch	2018-12-03 21:41:33.000000000 +0000
+++ libcommons-dbcp-java-1.4/debian/watch	2023-02-13 14:02:31.000000000 +0000
@@ -1,3 +1,3 @@
-version=3
-http://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz \
+version=4
+https://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz \
 	debian debian/orig-tar.sh