diff -Nru trove3-3.0.3/debian/changelog trove3-3.0.3/debian/changelog
--- trove3-3.0.3/debian/changelog	2016-01-30 15:10:40.000000000 +0000
+++ trove3-3.0.3/debian/changelog	2018-04-18 16:16:41.000000000 +0000
@@ -1,3 +1,13 @@
+trove3 (3.0.3-4) unstable; urgency=medium
+
+  * Team upload.
+  * Moved the javadoc to /usr/share/doc/libtrove3-java/api/
+  * Moved the package to Git
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 18 Apr 2018 18:16:41 +0200
+
 trove3 (3.0.3-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru trove3-3.0.3/debian/compat trove3-3.0.3/debian/compat
--- trove3-3.0.3/debian/compat	2016-01-30 15:10:40.000000000 +0000
+++ trove3-3.0.3/debian/compat	2018-04-18 16:09:20.000000000 +0000
@@ -1 +1 @@
-9
+11
diff -Nru trove3-3.0.3/debian/control trove3-3.0.3/debian/control
--- trove3-3.0.3/debian/control	2016-01-30 15:10:40.000000000 +0000
+++ trove3-3.0.3/debian/control	2018-04-18 16:09:20.000000000 +0000
@@ -2,12 +2,21 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Erich Schubert <erich@debian.org>, Torsten Werner <twerner@debian.org>
-Build-Depends: debhelper (>= 9), javahelper, default-jdk, ant, ant-optional, maven-repo-helper, junit4
-Standards-Version: 3.9.6
+Uploaders:
+ Erich Schubert <erich@debian.org>,
+ Torsten Werner <twerner@debian.org>
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 11),
+ default-jdk,
+ javahelper,
+ junit4,
+ maven-repo-helper
+Standards-Version: 4.1.4
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/trove3.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/trove3.git
 Homepage: http://trove4j.sourceforge.net/
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/trove3
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/trove3/
 
 Package: libtrove3-java
 Architecture: all
diff -Nru trove3-3.0.3/debian/copyright trove3-3.0.3/debian/copyright
--- trove3-3.0.3/debian/copyright	2016-01-30 15:10:40.000000000 +0000
+++ trove3-3.0.3/debian/copyright	2018-04-18 16:08:15.000000000 +0000
@@ -43,5 +43,3 @@
 supporting documentation. CERN makes no representations about the
 suitability of this software for any purpose. It is provided "as is"
 without expressed or implied warranty.
-
-
diff -Nru trove3-3.0.3/debian/libtrove3-java-doc.doc-base trove3-3.0.3/debian/libtrove3-java-doc.doc-base
--- trove3-3.0.3/debian/libtrove3-java-doc.doc-base	2016-01-30 15:10:40.000000000 +0000
+++ trove3-3.0.3/debian/libtrove3-java-doc.doc-base	2018-04-18 16:12:21.000000000 +0000
@@ -6,5 +6,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libtrove3-java-doc/api/index.html
-Files: /usr/share/doc/libtrove3-java-doc/api/*.html
+Index: /usr/share/doc/libtrove3-java/api/index.html
+Files: /usr/share/doc/libtrove3-java/api/*.html
diff -Nru trove3-3.0.3/debian/libtrove3-java-doc.install trove3-3.0.3/debian/libtrove3-java-doc.install
--- trove3-3.0.3/debian/libtrove3-java-doc.install	1970-01-01 00:00:00.000000000 +0000
+++ trove3-3.0.3/debian/libtrove3-java-doc.install	2018-04-18 16:12:52.000000000 +0000
@@ -0,0 +1 @@
+output/javadocs/*   /usr/share/doc/libtrove3-java/api
diff -Nru trove3-3.0.3/debian/rules trove3-3.0.3/debian/rules
--- trove3-3.0.3/debian/rules	2016-01-30 15:10:40.000000000 +0000
+++ trove3-3.0.3/debian/rules	2018-04-18 16:12:59.000000000 +0000
@@ -27,13 +27,7 @@
 	  /usr/share/java/trove-$(DEB_UPSTREAM_VERSION).jar \
 	  /usr/share/java/trove4j-$(DEB_UPSTREAM_VERSION).jar \
 	  /usr/share/java/trove-3.jar
-	# Install JavaDoc
-	dh_install -plibtrove3-java-doc \
-	  output/javadocs/* /usr/share/doc/libtrove3-java-doc/api
 
 make-pom:
 	@mkdir -p debian/poms
 	sed -e 's/###VERSION###/$(DEB_UPSTREAM_VERSION)/' < resources/maven-manual-deploy-pom.xml > debian/poms/trove4j-$(DEB_UPSTREAM_VERSION).pom
-
-get-orig-source:
-	uscan --upstream-version 0 --rename