diff -Nru metainf-services-1.3/debian/changelog metainf-services-1.4/debian/changelog
--- metainf-services-1.3/debian/changelog	2012-01-25 05:43:24.000000000 +0000
+++ metainf-services-1.4/debian/changelog	2012-04-26 12:22:34.000000000 +0000
@@ -1,3 +1,13 @@
+metainf-services (1.4-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Bumped Standards-Version to 3.9.3:
+    - d/copyright: Switched to released version of DEP-5.
+  * d/libmetainf-services.poms: Use --java-lib to ensure that jar files
+    are installed to /usr/share/java.
+
+ -- James Page <james.page@ubuntu.com>  Thu, 26 Apr 2012 13:19:35 +0100
+
 metainf-services (1.3-1) unstable; urgency=low
 
   [James Page]
diff -Nru metainf-services-1.3/debian/control metainf-services-1.4/debian/control
--- metainf-services-1.3/debian/control	2012-01-25 05:43:24.000000000 +0000
+++ metainf-services-1.4/debian/control	2012-04-26 12:22:34.000000000 +0000
@@ -9,7 +9,7 @@
  default-jdk-doc,
  libmaven-compiler-plugin-java (>= 2.0.2),
  libmaven-javadoc-plugin-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://java.net/projects/metainf-services
 Vcs-Git: git://git.debian.org/git/pkg-java/metainf-services.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/metainf-services.git
diff -Nru metainf-services-1.3/debian/copyright metainf-services-1.4/debian/copyright
--- metainf-services-1.3/debian/copyright	2012-01-25 05:43:24.000000000 +0000
+++ metainf-services-1.4/debian/copyright	2012-04-26 12:22:34.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: META-INF/services generator
 Upstream-Contact: Kohsuke Kawaguchi
 Source: http://java.net/projects/metainf-services
diff -Nru metainf-services-1.3/debian/libmetainf-services-java.poms metainf-services-1.4/debian/libmetainf-services-java.poms
--- metainf-services-1.3/debian/libmetainf-services-java.poms	2012-01-25 05:43:24.000000000 +0000
+++ metainf-services-1.4/debian/libmetainf-services-java.poms	2012-04-26 12:22:34.000000000 +0000
@@ -4,4 +4,4 @@
 # where option can be:
 #   --ignore: ignore this POM or
 #   --no-parent: remove the <parent> tag from the POM
-pom.xml
+pom.xml --java-lib
diff -Nru metainf-services-1.3/pom.xml metainf-services-1.4/pom.xml
--- metainf-services-1.3/pom.xml	2011-12-01 19:29:00.000000000 +0000
+++ metainf-services-1.4/pom.xml	2012-02-27 23:35:37.000000000 +0000
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.kohsuke.metainf-services</groupId>
   <artifactId>metainf-services</artifactId>
-  <version>1.3</version>  
+  <version>1.4</version>  
   <name>META-INF/services generator</name>
   <description>Annotation-driven META-INF/services auto-generation</description>
   <url>http://metainf-srvices.kohsuke.org/</url>
diff -Nru metainf-services-1.3/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java metainf-services-1.4/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java
--- metainf-services-1.3/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java	2011-12-01 19:29:00.000000000 +0000
+++ metainf-services-1.4/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java	2012-02-27 23:35:37.000000000 +0000
@@ -34,6 +34,7 @@
 import javax.lang.model.type.MirroredTypeException;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic.Kind;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
@@ -64,6 +65,8 @@
         if (roundEnv.processingOver())      return false;
 
         Map<String,Set<String>> services = new HashMap<String, Set<String>>();
+        
+        Elements elements = processingEnv.getElementUtils();
 
         // discover services from the current compilation sources
         for (Element e : roundEnv.getElementsAnnotatedWith(MetaInfServices.class)) {
@@ -74,11 +77,11 @@
             TypeElement contract = getContract(type, a);
             if(contract==null)  continue; // error should have already been reported
 
-            String cn = contract.getQualifiedName().toString();
+            String cn = elements.getBinaryName(contract).toString();
             Set<String> v = services.get(cn);
             if(v==null)
                 services.put(cn,v=new TreeSet<String>());
-            v.add(type.getQualifiedName().toString());
+            v.add(elements.getBinaryName(type).toString());
         }
 
         // also load up any existing values, since this compilation may be partial