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 ccc83430bb13a01f85da8de18f6cfc422a9fe027
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Jun 17 12:04:04 2013 +0000
Replaced the dependency on Google Collections by Guava
Use canonical URLs for the Vcs-* fields
debian/rules: Improved the clean target to allow rebuilds
---
debian/changelog | 9 +++++++++
debian/control | 10 +++++-----
debian/rules | 4 +++-
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d1df48c..8a9d88c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+plexus-containers (1.0~beta3.0.7-6) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Replaced the dependency on Google Collections by Guava
+ * Use canonical URLs for the Vcs-* fields
+ * debian/rules: Improved the clean target to allow rebuilds
+
+ -- Emmanuel Bourg <ebo...@apache.org> Mon, 17 Jun 2013 13:55:58 +0200
+
plexus-containers (1.0~beta3.0.7-5) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index c9dc186..9dd0d30 100644
--- a/debian/control
+++ b/debian/control
@@ -5,16 +5,16 @@ Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.or
Uploaders: Torsten Werner <twer...@debian.org>, Ludovic Claude
<ludovic.cla...@laposte.net>
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 (>= 1.0), libplexus-classworlds-java,
libplexus-utils-java,
+ libguava-java, libplexus-classworlds-java, libplexus-utils-java,
libxbean-java, junit
-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/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/plexus-containers
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/plexus-containers/
Homepage: http://plexus.codehaus.org
Package: libplexus-containers-java
Architecture: all
-Depends: ${misc:Depends}, libgoogle-collections-java (>= 1.0),
+Depends: ${misc:Depends}, libguava-java,
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/rules b/debian/rules
index 32ec6e1..89bed01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/ant.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
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 \
+DEB_JARS := ant-nodeps commons-cli guava maven2 plexus-classworlds
junit \
plexus-utils xbean-reflect
DEB_ANT_BUILD_TARGET := package javadoc
DEB_ANT_BUILDFILE := debian/build.xml
@@ -27,4 +27,6 @@ binary-post-install/lib$(PACKAGE)-java-doc::
dh_install -plib$(PACKAGE)-java-doc $(API_DOCS)
usr/share/doc/lib$(PACKAGE)-java
clean::
+ mh_clean
-rm -rf debian/tmp
+ mh_unpatchpoms -plib$(PACKAGE)-java
--
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
