diff -Nru freehep-graphicsio-tests-2.1.1+dfsg1/debian/changelog freehep-graphicsio-tests-2.1.1+dfsg1/debian/changelog
--- freehep-graphicsio-tests-2.1.1+dfsg1/debian/changelog	2016-07-21 10:11:03.000000000 +0000
+++ freehep-graphicsio-tests-2.1.1+dfsg1/debian/changelog	2017-11-04 15:27:25.000000000 +0000
@@ -1,3 +1,19 @@
+freehep-graphicsio-tests (2.1.1+dfsg1-5) unstable; urgency=medium
+
+  [ tony mancill ]
+  * Team upload.
+  * Remove Gabriele Giacone from Uploaders (Closes: #856751)
+
+  [ Giovanni Mascellani ]
+  * Do not request a specific libexec-maven-plugin-java version (closes:
+    #879256).
+  * Bump Standards-Version to 4.1.1.
+  * Change priority to optional.
+  * Switch build system to debhelper 10.
+  * Reformat some fields in debian/control.
+
+ -- Giovanni Mascellani <gio@debian.org>  Sat, 04 Nov 2017 16:27:25 +0100
+
 freehep-graphicsio-tests (2.1.1+dfsg1-4) unstable; urgency=low
 
   [ Giovanni Mascellani ]
diff -Nru freehep-graphicsio-tests-2.1.1+dfsg1/debian/compat freehep-graphicsio-tests-2.1.1+dfsg1/debian/compat
--- freehep-graphicsio-tests-2.1.1+dfsg1/debian/compat	2016-07-21 10:11:03.000000000 +0000
+++ freehep-graphicsio-tests-2.1.1+dfsg1/debian/compat	2017-11-04 15:27:25.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru freehep-graphicsio-tests-2.1.1+dfsg1/debian/control freehep-graphicsio-tests-2.1.1+dfsg1/debian/control
--- freehep-graphicsio-tests-2.1.1+dfsg1/debian/control	2016-07-21 10:11:03.000000000 +0000
+++ freehep-graphicsio-tests-2.1.1+dfsg1/debian/control	2017-11-04 15:27:25.000000000 +0000
@@ -1,21 +1,28 @@
 Source: freehep-graphicsio-tests
 Section: java
-Priority: extra
+Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Giovanni Mascellani <gio@debian.org>,
- Gabriele Giacone <1o5g4r8o@gmail.com>,
+Uploaders:
+ Giovanni Mascellani <gio@debian.org>,
  Philipp Huebner <debalance@debian.org>
-Build-Depends: debhelper (>= 9), maven-debian-helper, default-jdk
-Build-Depends-Indep: libfreehep-export-java, libfreehep-graphicsio-java,
- junit, libjas-plotter-java, libmaven-exec-plugin-java
-Standards-Version: 3.9.8
+Build-Depends:
+ debhelper (>= 10),
+ default-jdk,
+ maven-debian-helper
+Build-Depends-Indep:
+ junit,
+ libfreehep-export-java,
+ libfreehep-graphicsio-java,
+ libjas-plotter-java,
+ libmaven-exec-plugin-java
+Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/freehep/freehep-graphicsio-tests.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-java/freehep/freehep-graphicsio-tests.git
 Homepage: http://java.freehep.org/
 
 Package: libfreehep-graphicsio-tests-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
 Description: FreeHEP GraphicsIO Test Library
  The GraphicsIO library offers a base interface for image exporters in many
diff -Nru freehep-graphicsio-tests-2.1.1+dfsg1/debian/maven.rules freehep-graphicsio-tests-2.1.1+dfsg1/debian/maven.rules
--- freehep-graphicsio-tests-2.1.1+dfsg1/debian/maven.rules	2016-07-21 10:11:03.000000000 +0000
+++ freehep-graphicsio-tests-2.1.1+dfsg1/debian/maven.rules	2017-11-04 15:27:25.000000000 +0000
@@ -1,2 +1 @@
 junit junit jar s/.*/3.x/ *
-org.codehaus.mojo exec-maven-plugin maven-plugin s/.*/1.1.1/
diff -Nru freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/classpath.diff freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/classpath.diff
--- freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/classpath.diff	2016-07-21 10:11:03.000000000 +0000
+++ freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/classpath.diff	2017-11-04 15:27:25.000000000 +0000
@@ -1,11 +1,15 @@
 From: Giovanni Mascellani <gio@debian.org>
+Date: Mon, 30 Oct 2017 15:28:20 +0100
 Subject: Add classpath to compiled JAR
+
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: freehep-graphicsio-tests/pom.xml
-===================================================================
---- freehep-graphicsio-tests.orig/pom.xml
-+++ freehep-graphicsio-tests/pom.xml
+ pom.xml | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index a7a6067..f2d3797 100644
+--- a/pom.xml
++++ b/pom.xml
 @@ -40,6 +40,18 @@
            <keepAlive>true</keepAlive>
          </configuration>
diff -Nru freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/libexec-maven-plugin-java_version.diff freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/libexec-maven-plugin-java_version.diff
--- freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/libexec-maven-plugin-java_version.diff	1970-01-01 00:00:00.000000000 +0000
+++ freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/libexec-maven-plugin-java_version.diff	2017-11-04 15:27:25.000000000 +0000
@@ -0,0 +1,20 @@
+From: Giovanni Mascellani <gio@debian.org>
+Date: Mon, 30 Oct 2017 15:29:36 +0100
+Subject: Remove version information for plugin libexec-maven-plugin-java.
+
+---
+ pom.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index f2d3797..2f84757 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -27,7 +27,6 @@
+       <plugin>
+         <groupId>org.codehaus.mojo</groupId>
+         <artifactId>exec-maven-plugin</artifactId>
+-        <version>1.0.2</version>
+         <executions>
+           <execution>
+             <goals>
diff -Nru freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/series freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/series
--- freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/series	2016-07-21 10:11:03.000000000 +0000
+++ freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/series	2017-11-04 15:27:25.000000000 +0000
@@ -1,2 +1,3 @@
 TestCustomStrokes.diff
 classpath.diff
+libexec-maven-plugin-java_version.diff
diff -Nru freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/TestCustomStrokes.diff freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/TestCustomStrokes.diff
--- freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/TestCustomStrokes.diff	2016-07-21 10:11:03.000000000 +0000
+++ freehep-graphicsio-tests-2.1.1+dfsg1/debian/patches/TestCustomStrokes.diff	2017-11-04 15:27:25.000000000 +0000
@@ -1,11 +1,16 @@
 From: Giovanni Mascellani <gio@debian.org>
+Date: Mon, 30 Oct 2017 15:28:20 +0100
 Subject: Fixes after TestCustomStrokes.java removal
+
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestApplication.java
-===================================================================
---- freehep-graphicsio-tests.orig/src/main/java/org/freehep/graphicsio/test/TestApplication.java
-+++ freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestApplication.java
+ src/main/java/org/freehep/graphicsio/test/TestApplication.java | 1 -
+ src/main/java/org/freehep/graphicsio/test/TestSuite.java       | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/main/java/org/freehep/graphicsio/test/TestApplication.java b/src/main/java/org/freehep/graphicsio/test/TestApplication.java
+index 3ce50b2..049209b 100644
+--- a/src/main/java/org/freehep/graphicsio/test/TestApplication.java
++++ b/src/main/java/org/freehep/graphicsio/test/TestApplication.java
 @@ -18,7 +18,6 @@ public class TestApplication {
          frame.addPanel("All", new TestAll(null));
          frame.addPanel("Clip", new TestClip(null));
@@ -14,11 +19,11 @@
          frame.addPanel("FontDerivation", new TestFontDerivation(null));
          frame.addPanel("Fonts", new TestFonts(null));
          frame.addPanel("Histogram", new TestHistogram(null));
-Index: freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestSuite.java
-===================================================================
---- freehep-graphicsio-tests.orig/src/main/java/org/freehep/graphicsio/test/TestSuite.java
-+++ freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestSuite.java
-@@ -245,7 +245,6 @@ public class TestSuite extends junit.fra
+diff --git a/src/main/java/org/freehep/graphicsio/test/TestSuite.java b/src/main/java/org/freehep/graphicsio/test/TestSuite.java
+index f516196..ff3f0a7 100644
+--- a/src/main/java/org/freehep/graphicsio/test/TestSuite.java
++++ b/src/main/java/org/freehep/graphicsio/test/TestSuite.java
+@@ -245,7 +245,6 @@ public class TestSuite extends junit.framework.TestSuite {
          tests.add(new Test("TestAll", on));
          tests.add(new Test("TestClip", on));
          tests.add(new Test("TestColors", on));
diff -Nru freehep-graphicsio-tests-2.1.1+dfsg1/debian/rules freehep-graphicsio-tests-2.1.1+dfsg1/debian/rules
--- freehep-graphicsio-tests-2.1.1+dfsg1/debian/rules	2016-07-21 10:11:03.000000000 +0000
+++ freehep-graphicsio-tests-2.1.1+dfsg1/debian/rules	2017-11-04 15:27:25.000000000 +0000
@@ -7,4 +7,4 @@
 JAVA_HOME := /usr/lib/jvm/default-java
 
 %:
-	dh $@ --buildsystem=maven
+	dh $@