debian/changelog

+libcommons-dbcp-java (1.4-6) unstable; urgency=medium
+
+  * Depend on libtomcat9-java instead of libtomcat8-java
+  * Build with the DH sequencer instead of CDBS
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 03 Dec 2018 23:11:16 +0100
+
 libcommons-dbcp-java (1.4-5) unstable; urgency=medium
 
   * Build depend on libtomcat8-java instead of libtomcat7-java (Closes: #759640)

debian/compat

-9
+11

debian/control

@@ -2,19 +2,23 @@ Source: libcommons-dbcp-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib@debian.org>,
+Uploaders:
+ Damien Raude-Morvan <drazzib@debian.org>,
  Emmanuel Bourg <ebourg@apache.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: default-jdk-doc,
+Build-Depends:
+ debhelper (>= 11),
+ default-jdk,
+ default-jdk-doc,
  junit,
  libcommons-pool-java,
  libcommons-pool-java-doc,
  libgeronimo-jta-1.1-spec-java,
  libmaven-javadoc-plugin-java,
-                     libtomcat8-java
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-dbcp-java.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libcommons-dbcp-java.git
+ libtomcat9-java,
+ maven-debian-helper (>= 1.4)
+Standards-Version: 4.2.1
+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/
 
 Package: libcommons-dbcp-java

debian/maven.rules

@@ -18,4 +18,4 @@
 
 commons-dbcp commons-dbcp jar s/.*/debian/ * *
 junit junit jar s/.*/3.x/ * *
-s/tomcat/org.apache.tomcat/ s/naming-common/tomcat-catalina/ * s/.*/8.x/ * *
+s/tomcat/org.apache.tomcat/ s/naming-common/tomcat-catalina/ * s/.*/9.x/ * *

debian/rules

 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
-
-get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+%:
+	dh $@ --buildsystem=maven