Update to version 3.3.0 - matches canl-java 2.5.x

Drop old Provides/Replaces/Breaks for libvomsjapi-java(-doc)
Move VCS to salsa.debian.org

debian/changelog

+voms-api-java (3.3.0-1) unstable; urgency=medium
+
+  * Update to version 3.3.0 - matches canl-java 2.5.x
+  * Drop old Provides/Replaces/Breaks for libvomsjapi-java(-doc)
+  * Move VCS to salsa.debian.org
+
+ -- Mattias Ellert <mattias.ellert@physics.uu.se>  Wed, 21 Feb 2018 06:56:31 +0100
+
 voms-api-java (3.2.0-2) unstable; urgency=medium
 
   * BuildDepend on maven-debian-helper 2.2 or later

debian/control

 Source: voms-api-java
 Priority: optional
 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
+Build-Depends: debhelper (>> 9), maven-debian-helper (>= 2.2), libmaven-javadoc-plugin-java, libjcip-annotations-java, junit4, libhamcrest-java, libmockito-java, libcanl-java (>= 2.5.0)
+Standards-Version: 4.1.3
 Section: 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
+Vcs-Browser: https://salsa.debian.org/ellert/voms-api-java
+Vcs-Git: https://salsa.debian.org/ellert/voms-api-java.git
 Homepage: https://wiki.italiangrid.it/VOMS
 
 Package: libvoms-api-java-java
 Section: java
 Architecture: all
-Depends: ${misc:Depends}, libcanl-java (>= 2.3.0)
-Replaces: libvomsjapi-java (<< 2.0.7), libvomsjapi-java-gcj (<< 2.0.7)
-Breaks: libvomsjapi-java (<< 2.0.7)
-Provides: libvomsjapi-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Breaks: voms-clients-java (<< 3.3.0)
 Description: Virtual Organization Membership Service Java API
  The Virtual Organization Membership Service (VOMS) is an attribute authority
  which serves as central repository for VO user authorization information,
@@ -28,8 +26,6 @@ Description: Virtual Organization Membership Service Java API
 Package: libvoms-api-java-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
-Replaces: libvomsjapi-java-doc (<< 2.0.7)
-Provides: libvomsjapi-java-doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
 Description: Virtual Organization Membership Service Java API Documentation
  Virtual Organization Membership Service (VOMS) Java API Documentation.

debian/copyright

 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>
  Andrea Ceccanti <andrea.ceccanti@cnaf.infn.it>
-Source: https://github.com/italiangrid/voms-api-java/archive/v3.2.0.tar.gz
+ Valerio Venturi <valerio.venturi@cnaf.infn.it>
+ Daniele Andreotti <daniele.andreotti@cnaf.infn.it>
+Source: https://github.com/italiangrid/voms-api-java/archive/v3.3.0.tar.gz
 
 Files: *
 Copyright:
- Copyright (c) Members of the EGEE Collaboration. 2004-2016.
- See http://www.eu-egee.org/partners/ for details on the copyright holders.
+ Copyright (c) Istituto Nazionale di Fisica Nucleare, 2006-2014.
+License: Apache-2.0
+
+Files: src/main/java/org/italiangrid/voms/util/VOMSBase64Decoder.java
+Copyright:
+ Copyright (c) Istituto Nazionale di Fisica Nucleare, 2006-2014.
+ Copyright (c) Gidon Moont, Imperial College London, April 2006.
 License: Apache-2.0
 
 Files: debian/*
 Copyright:
- 2012-2017, Mattias Ellert <mattias.ellert@physics.uu.se>
+ 2012-2018, Mattias Ellert <mattias.ellert@physics.uu.se>
 License: Apache-2.0
 
 License: Apache-2.0

debian/maven.ignoreRules

 com.mycila.maven-license-plugin maven-license-plugin
-org.apache.maven.plugins        maven-deploy-plugin
-org.apache.maven.plugins        maven-release-plugin
 org.apache.maven.plugins        maven-source-plugin

debian/maven.rules

-junit junit * s/.*/4.x/
+junit            junit              * s/.*/4.x/
+org.bouncycastle s/bcpkix.*/bcpkix/ * s/.*/debian/
+org.bouncycastle s/bcprov.*/bcprov/ * s/.*/debian/