Remove work-around for broken maven-debian-helper

debian/changelog

+voms-api-java (3.2.0-2) unstable; urgency=medium
+
+  * BuildDepend on maven-debian-helper 2.2 or later
+  * Remove workaround for bug #807686 (fixed in maven-debian-helper 2.2)
+  * Change Maintainer e-mail (fysast → physics)
+
+ -- Mattias Ellert <mattias.ellert@physics.uu.se>  Thu, 29 Jun 2017 16:33:17 +0200
+
 voms-api-java (3.2.0-1) unstable; urgency=medium
 
   * Update to version 3.2.0 - matches canl-java 2.2.x

debian/compat

-5
+9

debian/control

 Source: voms-api-java
 Priority: optional
-Maintainer: Mattias Ellert <mattias.ellert@fysast.uu.se>
-Build-Depends: debhelper (>> 5), maven-debian-helper, libmaven-javadoc-plugin-java, libjcip-annotations-java, junit4, libhamcrest-java, libmockito-java, libcanl-java (>= 2.3.0)
-Standards-Version: 3.9.8
+Maintainer: Mattias Ellert <mattias.ellert@physics.uu.se>
+Build-Depends: debhelper (>> 9), maven-debian-helper (>= 2.2), libmaven-javadoc-plugin-java, libjcip-annotations-java, junit4, libhamcrest-java, libmockito-java, libcanl-java (>= 2.3.0)
+Standards-Version: 4.0.0
 Section: java
-Vcs-Browser: https://svn.nordugrid.org/trac/packaging/browser/debian/voms-api-java
-Vcs-Svn: https://svn.nordugrid.org/repos/packaging/debian/voms-api-java
+Vcs-Browser: http://svn.nordugrid.org/trac/packaging/browser/debian/voms-api-java
+Vcs-Svn: http://svn.nordugrid.org/repos/packaging/debian/voms-api-java
 Homepage: https://wiki.italiangrid.it/VOMS
 
 Package: libvoms-api-java-java

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: voms-api-java
 Upstream-Contact:
  Vincenzo Ciaschini <vincenzo.ciaschini@cnaf.infn.it>
@@ -13,7 +13,7 @@ License: Apache-2.0
 
 Files: debian/*
 Copyright:
- 2012-2016, Mattias Ellert <mattias.ellert@fysast.uu.se>
+ 2012-2017, Mattias Ellert <mattias.ellert@physics.uu.se>
 License: Apache-2.0
 
 License: Apache-2.0

debian/mh_resolve_dependencies

-#!/bin/sh
-touch debian/libvoms-api-java-java.substvars

debian/rules

@@ -3,6 +3,3 @@
 
 %:
 	dh $@ --buildsystem=maven
-
-override_dh_auto_install:
-	PATH=$(CURDIR)/debian:$${PATH} dh_auto_install