diff -Nru eclipse-cdt-8.6.0/debian/changelog eclipse-cdt-8.6.0/debian/changelog
--- eclipse-cdt-8.6.0/debian/changelog	2015-04-29 05:05:47.000000000 +0000
+++ eclipse-cdt-8.6.0/debian/changelog	2016-10-19 20:35:34.000000000 +0000
@@ -1,3 +1,15 @@
+eclipse-cdt (8.6.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on eclipse-pde >= 3.8.1-9 to fix the build failure with Java 8
+    (Closes: #817880)
+  * Removed the unused Lintian overrides
+  * Standards-Version updated to 3.9.8
+  * Use secure Vcs-* URLs
+  * Fixed the watch file
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 19 Oct 2016 22:35:34 +0200
+
 eclipse-cdt (8.6.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru eclipse-cdt-8.6.0/debian/control eclipse-cdt-8.6.0/debian/control
--- eclipse-cdt-8.6.0/debian/control	2015-04-29 05:05:47.000000000 +0000
+++ eclipse-cdt-8.6.0/debian/control	2016-10-19 20:30:33.000000000 +0000
@@ -6,15 +6,15 @@
 Build-Depends: debhelper (>= 9.20120608~),
                default-jdk (>= 2:1.7),
                dpkg-dev (>= 1.16.2~),
-               eclipse-pde (>= 3.8.1-8),
+               eclipse-pde (>= 3.8.1-9),
                eclipse-remote-services-api,
                eclipse-rse,
                javahelper (>= 0.32~),
                unzip,
                zip
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/eclipse-cdt.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/eclipse-cdt.git
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/eclipse-cdt.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/eclipse-cdt.git
 Homepage: http://www.eclipse.org/cdt/
 
 Package: eclipse-cdt
diff -Nru eclipse-cdt-8.6.0/debian/eclipse-cdt-autotools.lintian-overrides eclipse-cdt-8.6.0/debian/eclipse-cdt-autotools.lintian-overrides
--- eclipse-cdt-8.6.0/debian/eclipse-cdt-autotools.lintian-overrides	2015-04-29 05:05:47.000000000 +0000
+++ eclipse-cdt-8.6.0/debian/eclipse-cdt-autotools.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-eclipse-cdt-autotools: incompatible-java-bytecode-format
diff -Nru eclipse-cdt-8.6.0/debian/eclipse-cdt-launch-remote.lintian-overrides eclipse-cdt-8.6.0/debian/eclipse-cdt-launch-remote.lintian-overrides
--- eclipse-cdt-8.6.0/debian/eclipse-cdt-launch-remote.lintian-overrides	2015-04-29 05:05:47.000000000 +0000
+++ eclipse-cdt-8.6.0/debian/eclipse-cdt-launch-remote.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-eclipse-cdt-launch-remote: incompatible-java-bytecode-format
diff -Nru eclipse-cdt-8.6.0/debian/eclipse-cdt.lintian-overrides eclipse-cdt-8.6.0/debian/eclipse-cdt.lintian-overrides
--- eclipse-cdt-8.6.0/debian/eclipse-cdt.lintian-overrides	2015-04-29 05:05:47.000000000 +0000
+++ eclipse-cdt-8.6.0/debian/eclipse-cdt.lintian-overrides	2016-10-19 20:28:11.000000000 +0000
@@ -1,2 +1 @@
 eclipse-cdt: codeless-jar usr/share/eclipse/dropins/cdt/eclipse/plugins/org.eclipse.cdt_*.dist.jar
-eclipse-cdt: incompatible-java-bytecode-format
diff -Nru eclipse-cdt-8.6.0/debian/eclipse-cdt-qt.lintian-overrides eclipse-cdt-8.6.0/debian/eclipse-cdt-qt.lintian-overrides
--- eclipse-cdt-8.6.0/debian/eclipse-cdt-qt.lintian-overrides	2015-04-29 05:05:47.000000000 +0000
+++ eclipse-cdt-8.6.0/debian/eclipse-cdt-qt.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-eclipse-cdt-qt: incompatible-java-bytecode-format
diff -Nru eclipse-cdt-8.6.0/debian/watch eclipse-cdt-8.6.0/debian/watch
--- eclipse-cdt-8.6.0/debian/watch	2015-04-29 05:05:47.000000000 +0000
+++ eclipse-cdt-8.6.0/debian/watch	2016-10-19 20:34:04.000000000 +0000
@@ -1,4 +1,4 @@
 version=3
 opts=dversionmangle=s/\+dfsg\d?// \
 http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/refs/ \
-/c/cdt/org.eclipse.cdt.git/snapshot/CDT_(\d+)_(\d+)_(\d+).tar.bz2
+/c/cdt/org.eclipse.cdt.git/snapshot/CDT_(\d+)_(\d+)_(\d+).tar.gz