debian/changelog

+doxia (1.7-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with maven-parent 31 (Closes: #906350)
+  * Removed the unused build dependency on libmaven-plugin-tools-java
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 26 Nov 2018 13:10:55 +0100
+
 doxia (1.7-1) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -3,10 +3,10 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner@debian.org>
-Build-Depends: debhelper (>= 10),
+Build-Depends:
+ debhelper (>= 11),
  default-jdk,
-               maven-debian-helper (>= 2.2.2~)
-Build-Depends-Indep: default-jdk-doc,
+ default-jdk-doc,
  fop (>= 1:2.0),
  junit4,
  libcommons-collections3-java,
@@ -21,7 +21,6 @@ Build-Depends-Indep: default-jdk-doc,
  libmaven-doxia-tools-java,
  libmaven-javadoc-plugin-java,
  libmaven-parent-java,
-                     libmaven-plugin-tools-java,
  libmaven-shade-plugin-java,
  libmodello-maven-plugin-java,
  libpegdown-java,
@@ -30,10 +29,11 @@ Build-Depends-Indep: default-jdk-doc,
  libplexus-i18n-java,
  libplexus-utils-java,
  libplexus-utils-java-doc,
-                     libxerces2-java
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/doxia.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/doxia.git
+ libxerces2-java,
+ maven-debian-helper (>= 2.2.2~)
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/doxia.git
+Vcs-Browser: https://salsa.debian.org/java-team/doxia
 Homepage: http://maven.apache.org/doxia/
 
 Package: libdoxia-java

debian/libdoxia-java.poms

@@ -25,11 +25,11 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --has-package-version --package=libdoxia-core-java --java-lib
-doxia-logging-api/pom.xml --has-package-version --package=libdoxia-core-java --java-lib
-doxia-sink-api/pom.xml --has-package-version --package=libdoxia-core-java --java-lib
+pom.xml                                           --has-package-version --java-lib --package=libdoxia-core-java
+doxia-logging-api/pom.xml                         --has-package-version --java-lib --package=libdoxia-core-java
+doxia-sink-api/pom.xml                            --has-package-version --java-lib --package=libdoxia-core-java
 doxia-test-docs/pom.xml                           --ignore
-doxia-core/pom.xml --has-package-version --package=libdoxia-core-java --java-lib
+doxia-core/pom.xml                                --has-package-version --java-lib --package=libdoxia-core-java
 doxia-modules/pom.xml                             --has-package-version --java-lib
 doxia-modules/doxia-module-apt/pom.xml            --has-package-version --java-lib
 doxia-modules/doxia-module-confluence/pom.xml     --has-package-version --java-lib

debian/maven.rules

@@ -21,3 +21,4 @@ commons-collections commons-collections * s/.*/3.x/ * *
 junit junit jar s/.*/4.x/ * *
 log4j log4j jar s/1\.2\..*/1.2.x/ * *
 org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * *
+org.apache.maven maven-parent pom s/.*/debian/ * *

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename