[SCM] bridge-method-injector packaging branch, master, updated. debian/1.4-2-1-gc1aedeb

[James Page]

The following commit has been merged in the master branch:
commit c1aedeb0416665d3154faf2d377b322131fe1d3b
Author: James Page <james.page at ubuntu.com>
Date:   Mon Apr 30 14:22:20 2012 +0100

    Use new version of annotation-indexer:
    
    * Use new version of annotation-indexer:
      - d/maven.rules: Map to new org.jenkins-ci groupID.
      - d/control: Added version to BDI to ensure compatibility.
    * Bumped Standards-Version to 3.9.3:
      - d/copyright: Use new released version of DEP-5.
    * d/libbridge-method-injector-java.poms: Use --java-lib option to
      ensure that jar files are installed to /usr/share/java.

diff --git a/debian/changelog b/debian/changelog
index 9ec2c9f..ecbe9d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+bridge-method-injector (1.4-3) unstable; urgency=low
+
+  * Use new version of annotation-indexer:
+    - d/maven.rules: Map to new org.jenkins-ci groupID.
+    - d/control: Added version to BDI to ensure compatibility.
+  * Bumped Standards-Version to 3.9.3:
+    - d/copyright: Use new released version of DEP-5.
+  * d/libbridge-method-injector-java.poms: Use --java-lib option to
+    ensure that jar files are installed to /usr/share/java.
+
+ -- James Page <james.page at ubuntu.com>  Mon, 30 Apr 2012 14:17:38 +0100
+
 bridge-method-injector (1.4-2) unstable; urgency=low
 
   * Fix FTBFS with asm3 >= 3.3 (LP: #851659):
diff --git a/debian/control b/debian/control
index 6a471aa..bfb8843 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
 Build-Depends-Indep:
  default-jdk-doc,
  junit (>= 3.8.1),
- libannotation-indexer-java,
+ libannotation-indexer-java (>= 1.3),
  libasm3-java,
  libmaven-antrun-plugin-java,
  libmaven-install-plugin-java,
@@ -16,7 +16,7 @@ Build-Depends-Indep:
  libmaven-plugin-tools-java,
  libmaven2-core-java,
  libmaven2-core-java-doc
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://bridge-method-injector.infradna.com/
 Vcs-Git: git://git.debian.org/git/pkg-java/bridge-method-injector.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/bridge-method-injector.git
diff --git a/debian/copyright b/debian/copyright
index 74a7486..0e3c24d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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: Bridge Method Injector
 Upstream-Contact:  Kohsuke Kawaguchi as Developer
 Source: http://bridge-method-injector.infradna.com/
diff --git a/debian/libbridge-method-injector-java.poms b/debian/libbridge-method-injector-java.poms
index b75034f..9751c4f 100644
--- a/debian/libbridge-method-injector-java.poms
+++ b/debian/libbridge-method-injector-java.poms
@@ -20,5 +20,5 @@
 #   --dest-jar=<path>: the destination for the real jar
 #
 pom.xml 
-annotation/pom.xml 
-injector/pom.xml 
+annotation/pom.xml --java-lib
+injector/pom.xml --java-lib
diff --git a/debian/maven.rules b/debian/maven.rules
index 5c38abb..2d0ea5d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -18,4 +18,5 @@
 
 junit junit jar s/3\..*/3.x/ * *
 asm s/asm-debug-all/asm-all/ jar s/3\..*/3.x/* *
+s/org.jvnet.hudson/org.jenkins-ci/ annotation-indexer * s/.*/debian/ * *
 

-- 
bridge-method-injector packaging