[pkg-java] r13729 - in trunk/plexus-containers/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-05-31 00:50:17 +0000 (Tue, 31 May 2011)
New Revision: 13729

Added:
   trunk/plexus-containers/debian/patches/
   trunk/plexus-containers/debian/patches/google_collections_10.diff
   trunk/plexus-containers/debian/patches/series
Modified:
   trunk/plexus-containers/debian/changelog
   trunk/plexus-containers/debian/compat
   trunk/plexus-containers/debian/control
   trunk/plexus-containers/debian/rules
Log:
* Team upload.
* Fix FTBFS with libgoogle-collections >= 1.0,
  closes: #625972, #628328, #628294
* Bump to Standards-Version 3.9.2: no changes needed.
* Bump Debhelper compat level to 7.

Modified: trunk/plexus-containers/debian/changelog
===================================================================
--- trunk/plexus-containers/debian/changelog	2011-05-30 21:17:28 UTC (rev 13728)
+++ trunk/plexus-containers/debian/changelog	2011-05-31 00:50:17 UTC (rev 13729)
@@ -1,3 +1,13 @@
+plexus-containers (1.0~beta3.0.7-5) unstable; urgency=low
+
+  * Team upload.
+  * Fix FTBFS with libgoogle-collections >= 1.0,
+    closes: #625972, #628328, #628294
+  * Bump to Standards-Version 3.9.2: no changes needed.
+  * Bump Debhelper compat level to 7.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 31 May 2011 02:41:40 +0200
+
 plexus-containers (1.0~beta3.0.7-4) unstable; urgency=low
 
   * Downgrade Build-Depends: default-jdk.

Modified: trunk/plexus-containers/debian/compat
===================================================================
--- trunk/plexus-containers/debian/compat	2011-05-30 21:17:28 UTC (rev 13728)
+++ trunk/plexus-containers/debian/compat	2011-05-31 00:50:17 UTC (rev 13729)
@@ -1 +1 @@
-5
+7

Modified: trunk/plexus-containers/debian/control
===================================================================
--- trunk/plexus-containers/debian/control	2011-05-30 21:17:28 UTC (rev 13728)
+++ trunk/plexus-containers/debian/control	2011-05-31 00:50:17 UTC (rev 13729)
@@ -3,18 +3,18 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
- libgoogle-collections-java, libplexus-classworlds-java, libplexus-utils-java, 
+ libgoogle-collections-java (>= 1.0), libplexus-classworlds-java, libplexus-utils-java, 
  libxbean-java, junit
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-containers
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-containers/
 Homepage: http://plexus.codehaus.org
 
 Package: libplexus-containers-java
 Architecture: all
-Depends: ${misc:Depends}, libgoogle-collections-java,
+Depends: ${misc:Depends}, libgoogle-collections-java (>= 1.0),
  libplexus-classworlds-java, libplexus-utils-java, libxbean-java
 Conflicts: libplexus-container-default-java (<= 1.0-alpha-9-stable-1-2)
 Description: utilities for the Plexus framework

Added: trunk/plexus-containers/debian/patches/google_collections_10.diff
===================================================================
--- trunk/plexus-containers/debian/patches/google_collections_10.diff	                        (rev 0)
+++ trunk/plexus-containers/debian/patches/google_collections_10.diff	2011-05-31 00:50:17 UTC (rev 13729)
@@ -0,0 +1,24 @@
+Description: Fix FTBFS with libgoogle-collections >= 1.0
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-05-31
+Forwarded: no
+--- a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java
++++ b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/DefaultComponentRepository.java
+@@ -82,7 +82,7 @@
+         }
+ 
+         // Get all valid component descriptors
+-        Multimap<String, ComponentDescriptor<?>> roleHintIndex = Multimaps.newLinkedHashMultimap();
++        Multimap<String, ComponentDescriptor<?>> roleHintIndex = com.google.common.collect.LinkedHashMultimap.create();
+         for ( ClassRealm realm : realms )
+         {
+             SortedMap<String, Multimap<String, ComponentDescriptor<?>>> roleIndex = index.get( realm );
+@@ -189,7 +189,7 @@
+         Multimap<String, ComponentDescriptor<?>> roleHintIndex = roleIndex.get( role );
+         if ( roleHintIndex == null )
+         {
+-            roleHintIndex = Multimaps.newLinkedHashMultimap();
++            roleHintIndex = com.google.common.collect.LinkedHashMultimap.create();
+             roleIndex.put( role, roleHintIndex );
+         }
+         roleHintIndex.put( componentDescriptor.getRoleHint(), componentDescriptor );

Added: trunk/plexus-containers/debian/patches/series
===================================================================
--- trunk/plexus-containers/debian/patches/series	                        (rev 0)
+++ trunk/plexus-containers/debian/patches/series	2011-05-31 00:50:17 UTC (rev 13729)
@@ -0,0 +1 @@
+google_collections_10.diff

Modified: trunk/plexus-containers/debian/rules
===================================================================
--- trunk/plexus-containers/debian/rules	2011-05-30 21:17:28 UTC (rev 13728)
+++ trunk/plexus-containers/debian/rules	2011-05-31 00:50:17 UTC (rev 13729)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
+VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~beta/-beta-/")
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps commons-cli google-collections maven2 plexus-classworlds junit \
   plexus-utils xbean-reflect