[SCM] guava-libraries: suite of Google Common Libraries for Java 5.0 branch, master, updated. debian/13.0.1-3-5-g9819ccf

[Emmanuel Bourg]

The following commit has been merged in the master branch:
commit 9819ccff26fa6a4c61e4831c539cfd20db64aed9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 29 09:57:10 2013 +0200

    Added the new dependency on libatinject-jsr330-api-java

diff --git a/debian/changelog b/debian/changelog
index c1eab75..1a94dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+guava-libraries (14.0.1-1) unstable; urgency=low
+
+  * New upstream release
+    - new dependency on libatinject-jsr330-api-java 
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 29 May 2013 09:53:01 +0200
+
 guava-libraries (13.0.1-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 91a2a90..beec9d1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: guava-libraries
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Miguel Landaeta <miguel at miguel.cc>,
+Uploaders: Miguel Landaeta <miguel at miguel.cc>, Emmanuel Bourg <ebourg at apache.org>,
  James Page <james.page at canonical.com>
 Build-Depends: ant-optional, debhelper (>= 7.0.50~), default-jdk, javahelper, bnd
-Build-Depends-Indep: maven-repo-helper, libjsr305-java
+Build-Depends-Indep: maven-repo-helper, libjsr305-java, libatinject-jsr330-api-java
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-java/guava-libraries.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/guava-libraries.git
@@ -13,14 +13,14 @@ Homepage: http://code.google.com/p/guava-libraries/
 
 Package: libguava-java
 Architecture: all
-Depends: libjsr305-java, ${misc:Depends}
+Depends: libjsr305-java, libatinject-jsr330-api-java, ${misc:Depends}
 Description: suite of Google Common Libraries for Java 5.0
  Guava is a suite of core and expanded libraries that include
  utility classes, google's collections, io classes, concurrency
  support and other features.
  .
- Guava has only one code dependency: javax.annotation, per the
- JSR-305 spec.
+ Guava has two code dependencies - javax.annotation per the JSR-305 spec
+ and javax.inject per the JSR-330 spec.
 
 Package: libguava-java-doc
 Architecture: all
@@ -33,7 +33,7 @@ Description: documentation for libguava-java
  utility classes, google's collections, io classes, concurrency
  support and other features.
  .
- Guava has only one code dependency: javax.annotation, per the
- JSR-305 spec.
+ Guava has two code dependencies - javax.annotation per the JSR-305 spec
+ and javax.inject per the JSR-330 spec.
  .
  This package contains the javadocs of Guava library suite.
diff --git a/debian/pom.xml b/debian/pom.xml
index acb6b48..32e6b76 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -5,17 +5,18 @@
   <parent>
     <groupId>com.google.guava</groupId>
     <artifactId>guava-parent</artifactId>
-    <version>13.0.1</version>
+    <version>14.0.1</version>
   </parent>
   <artifactId>guava</artifactId>
   <name>Guava: Google Core Libraries for Java</name>
+  <packaging>bundle</packaging>
   <description>
     Guava is a suite of core and expanded libraries that include
     utility classes, google's collections, io classes, and much
     much more.
 
-    Guava has only one code dependency - javax.annotation,
-    per the JSR-305 spec.
+    Guava has two code dependencies - javax.annotation
+    per the JSR-305 spec and javax.inject per the JSR-330 spec.
   </description>
   <dependencies>
     <dependency>
@@ -24,22 +25,20 @@
       <version>1.3.9</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>2.3.7</version>
+        <extensions>true</extensions>
         <executions>
           <execution>
             <id>bundle-manifest</id>
@@ -54,6 +53,7 @@
             <Export-Package>!com.google.common.base.internal,com.google.common.*</Export-Package>
             <Import-Package>
               javax.annotation;resolution:=optional,
+              javax.inject;resolution:=optional,
               sun.misc.*;resolution:=optional
             </Import-Package>
           </instructions>
diff --git a/debian/rules b/debian/rules
index 75d6ebb..8dbf343 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 PACKAGE   := libguava-java
 VERSION   := $(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^Version: (.+)-.+$$/\1/')
 export JAVA_HOME := /usr/lib/jvm/default-java
-export CLASSPATH := /usr/share/java/jsr305.jar
+export CLASSPATH := /usr/share/java/jsr305.jar:/usr/share/java/atinject-jsr330-api.jar
 
 %:
 	dh $@ --with javahelper

-- 
guava-libraries: suite of Google Common Libraries for Java 5.0