diff -Nru jcommander-1.71/debian/changelog jcommander-1.71/debian/changelog
--- jcommander-1.71/debian/changelog	2018-02-15 00:40:37.000000000 +0000
+++ jcommander-1.71/debian/changelog	2019-02-27 14:14:33.000000000 +0000
@@ -1,3 +1,26 @@
+jcommander (1.71-3~18.04) bionic; urgency=medium
+
+  * Backport for OpenJDK 11. LP: #1814133.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 27 Feb 2019 15:14:33 +0100
+
+jcommander (1.71-3) unstable; urgency=medium
+
+  * Team upload.
+  * Generate Java 8 bytecode to preserve the backward compatibility
+  * Fixed the Vcs-Git URL
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 02 Aug 2018 10:00:47 +0200
+
+jcommander (1.71-2) unstable; urgency=medium
+
+  * Team upload.
+  * Build depend on default-jdk only to fix the javadoc
+  * Standards-Version updated to 4.1.5
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 30 Jul 2018 22:16:47 +0200
+
 jcommander (1.71-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru jcommander-1.71/debian/control jcommander-1.71/debian/control
--- jcommander-1.71/debian/control	2018-02-07 15:14:39.000000000 +0000
+++ jcommander-1.71/debian/control	2018-08-02 07:56:42.000000000 +0000
@@ -5,12 +5,12 @@
 Uploaders: Kai-Chung Yan (殷啟聰) <seamlikok@gmail.com>
 Build-Depends-Indep: debhelper (>= 11),
                      default-jdk-doc,
-                     default-jdk-headless (>= 2:1.8),
+                     default-jdk (>= 2:1.8),
                      gradle-debian-helper,
                      maven-repo-helper (>= 1.9)
-Standards-Version: 4.1.3
-Vcs-Git: https://://anonscm.debian.org/pkg-java/jcommander.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jcommander.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/jcommander.git
+Vcs-Browser: https://salsa.debian.org/java-team/jcommander
 Homepage: http://jcommander.org
 
 Package: libjcommander-java
diff -Nru jcommander-1.71/debian/patches/java8-compatibility.patch jcommander-1.71/debian/patches/java8-compatibility.patch
--- jcommander-1.71/debian/patches/java8-compatibility.patch	1970-01-01 00:00:00.000000000 +0000
+++ jcommander-1.71/debian/patches/java8-compatibility.patch	2018-08-02 07:57:56.000000000 +0000
@@ -0,0 +1,17 @@
+Description: Preserves the Java 8 compatibility
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -23,6 +23,11 @@
+     testCompile 'org.testng:testng:6.9.13'
+ }
+ 
++compileJava   {
++    sourceCompatibility = '1.8'
++    targetCompatibility = '1.8'
++}
++
+ task sourceJar(type: Jar) {
+     group 'Build'
+     description 'An archive of the source code'
diff -Nru jcommander-1.71/debian/patches/series jcommander-1.71/debian/patches/series
--- jcommander-1.71/debian/patches/series	2018-02-07 13:24:55.000000000 +0000
+++ jcommander-1.71/debian/patches/series	2018-08-02 07:52:21.000000000 +0000
@@ -1 +1,2 @@
 build.gradle.diff
+java8-compatibility.patch
diff -Nru jcommander-1.71/debian/rules jcommander-1.71/debian/rules
--- jcommander-1.71/debian/rules	2018-02-07 13:50:24.000000000 +0000
+++ jcommander-1.71/debian/rules	2018-07-30 20:08:55.000000000 +0000
@@ -9,6 +9,3 @@
 
 override_dh_auto_build:
 	dh_auto_build -- assemble javadoc
-
-get-orig-source:
-	uscan --download-current-version --force-download --repack --compression xz
\ No newline at end of file
diff -Nru jcommander-1.71/debian/watch jcommander-1.71/debian/watch
--- jcommander-1.71/debian/watch	2018-02-07 12:43:24.000000000 +0000
+++ jcommander-1.71/debian/watch	2018-07-30 20:09:39.000000000 +0000
@@ -1,2 +1,3 @@
 version=4
-https://github.com/cbeust/jcommander/tags /cbeust/jcommander/archive/@ANY_VERSION@\.tar\.gz
\ No newline at end of file
+opts="repack,compression=xz" \
+https://github.com/cbeust/jcommander/tags /cbeust/jcommander/archive/@ANY_VERSION@\.tar\.gz