diff -Nru hawtjni-1.15/debian/changelog hawtjni-1.15/debian/changelog
--- hawtjni-1.15/debian/changelog	2017-09-11 07:41:57.000000000 +0000
+++ hawtjni-1.15/debian/changelog	2018-11-23 23:51:08.000000000 +0000
@@ -1,3 +1,13 @@
+hawtjni (1.15-3) unstable; urgency=medium
+
+  * Build depend on libplexus-component-metadata-java
+    instead of libplexus-maven-plugin-java
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sat, 24 Nov 2018 00:51:08 +0100
+
 hawtjni (1.15-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru hawtjni-1.15/debian/compat hawtjni-1.15/debian/compat
--- hawtjni-1.15/debian/compat	2017-06-26 14:41:05.000000000 +0000
+++ hawtjni-1.15/debian/compat	2018-11-23 23:43:54.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru hawtjni-1.15/debian/control hawtjni-1.15/debian/control
--- hawtjni-1.15/debian/control	2017-09-11 07:41:28.000000000 +0000
+++ hawtjni-1.15/debian/control	2018-11-23 23:44:48.000000000 +0000
@@ -5,15 +5,15 @@
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
 Build-Depends:
  default-jdk,
- debhelper (>= 10),
+ debhelper (>= 11),
  libasm-java,
  libmaven-plugin-tools-java,
- libplexus-maven-plugin-java,
+ libplexus-component-metadata-java,
  libxbean-java,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/hawtjni.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/hawtjni.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/hawtjni.git
+Vcs-Browser: https://salsa.debian.org/java-team/hawtjni
 Homepage: http://fusesource.com/forge/sites/hawtjni/
 
 Package: libhawtjni-runtime-java
diff -Nru hawtjni-1.15/debian/maven.ignoreRules hawtjni-1.15/debian/maven.ignoreRules
--- hawtjni-1.15/debian/maven.ignoreRules	2017-09-11 07:39:08.000000000 +0000
+++ hawtjni-1.15/debian/maven.ignoreRules	2018-11-23 23:47:44.000000000 +0000
@@ -10,3 +10,4 @@
 org.apache.maven.plugins maven-surefire-plugin * * * *
 org.codehaus.mojo jxr-maven-plugin * * * *
 org.codehaus.mojo surefire-report-maven-plugin * * * *
+org.codehaus.plexus plexus-maven-plugin * * * *
diff -Nru hawtjni-1.15/debian/patches/01-plexus-component-metadata.patch hawtjni-1.15/debian/patches/01-plexus-component-metadata.patch
--- hawtjni-1.15/debian/patches/01-plexus-component-metadata.patch	1970-01-01 00:00:00.000000000 +0000
+++ hawtjni-1.15/debian/patches/01-plexus-component-metadata.patch	2018-11-23 23:49:50.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Generate the component descriptor with plexus-component-metadata instead of plexus-maven-plugin
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/maven-hawtjni-plugin/pom.xml
++++ b/maven-hawtjni-plugin/pom.xml
+@@ -133,6 +133,18 @@
+           </execution>
+         </executions>
+       </plugin>
++      <plugin>
++        <groupId>org.codehaus.plexus</groupId>
++        <artifactId>plexus-component-metadata</artifactId>
++        <executions>
++          <execution>
++            <id>process-classes</id>
++            <goals>
++              <goal>generate-metadata</goal>
++            </goals>
++          </execution>
++        </executions>
++      </plugin>
+       
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
diff -Nru hawtjni-1.15/debian/patches/series hawtjni-1.15/debian/patches/series
--- hawtjni-1.15/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ hawtjni-1.15/debian/patches/series	2018-11-23 23:46:05.000000000 +0000
@@ -0,0 +1 @@
+01-plexus-component-metadata.patch
diff -Nru hawtjni-1.15/debian/rules hawtjni-1.15/debian/rules
--- hawtjni-1.15/debian/rules	2017-06-26 14:41:05.000000000 +0000
+++ hawtjni-1.15/debian/rules	2018-11-23 23:43:54.000000000 +0000
@@ -1,8 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=maven
-
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename
+	dh $@