This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master-1.0
in repository plexus-containers.
commit 943dc0d3960d41199c61cd7b03a6e40a3eed1ab2
Author: Damien Raude-Morvan <draz...@debian.org>
Date: Tue May 31 00:50:17 2011 +0000
* 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.
---
debian/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 8 ++++----
debian/patches/google_collections_10.diff | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
6 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5b2b801..d1df48c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <draz...@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.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 529d9fe..c9dc186 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,18 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Torsten Werner <twer...@debian.org>, Ludovic Claude
<ludovic.cla...@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
diff --git a/debian/patches/google_collections_10.diff
b/debian/patches/google_collections_10.diff
new file mode 100644
index 0000000..54b1217
--- /dev/null
+++ b/debian/patches/google_collections_10.diff
@@ -0,0 +1,24 @@
+Description: Fix FTBFS with libgoogle-collections >= 1.0
+Author: Damien Raude-Morvan <draz...@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 );
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..16cf6cd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+google_collections_10.diff
diff --git a/debian/rules b/debian/rules
index 12f96e7..32ec6e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/plexus-containers.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
