diff -Nru plexus-containers-1.0~beta3.0.7/debian/changelog plexus-containers-1.0~beta3.0.7/debian/changelog --- plexus-containers-1.0~beta3.0.7/debian/changelog 2011-05-31 00:42:13.000000000 +0000 +++ plexus-containers-1.0~beta3.0.7/debian/changelog 2013-09-23 11:00:57.000000000 +0000 @@ -1,3 +1,20 @@ +plexus-containers (1.0~beta3.0.7-7) unstable; urgency=low + + * Team upload. + * Replaced Google Collections by Guava in the pom installed + in /usr/share/maven-repo (Closes: #724149) + + -- Emmanuel Bourg Mon, 23 Sep 2013 13:00:53 +0200 + +plexus-containers (1.0~beta3.0.7-6) unstable; 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 Wed, 11 Sep 2013 19:13:31 +0200 + plexus-containers (1.0~beta3.0.7-5) unstable; urgency=low * Team upload. diff -Nru plexus-containers-1.0~beta3.0.7/debian/control plexus-containers-1.0~beta3.0.7/debian/control --- plexus-containers-1.0~beta3.0.7/debian/control 2011-05-31 00:23:55.000000000 +0000 +++ plexus-containers-1.0~beta3.0.7/debian/control 2013-09-11 17:14:24.000000000 +0000 @@ -2,20 +2,30 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers -Uploaders: Torsten Werner , Ludovic Claude -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, - 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/ +Uploaders: Torsten Werner , + Ludovic Claude +Build-Depends: cdbs (>= 0.4.5.3), debhelper (>= 7), default-jdk +Build-Depends-Indep: ant, + ant-optional, + junit, + libguava-java, + libplexus-classworlds-java, + libplexus-utils-java, + libxbean-java, + maven-ant-helper (>> 4), + maven-repo-helper +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), - libplexus-classworlds-java, libplexus-utils-java, libxbean-java +Depends: libguava-java, + libplexus-classworlds-java, + libplexus-utils-java, + libxbean-java, + ${misc:Depends} Conflicts: libplexus-container-default-java (<= 1.0-alpha-9-stable-1-2) Description: utilities for the Plexus framework The Plexus project provides a full software stack for creating and executing @@ -34,7 +44,7 @@ * Auto-wiring * Component dependencies, and * Various dependency injection techniques including constructor injection, - setter injection, and private field injection. + setter injection, and private field injection. . This package replaces the old packages libplexus-containers-default-java. @@ -60,7 +70,7 @@ * Auto-wiring * Component dependencies, and * Various dependency injection techniques including constructor injection, - setter injection, and private field injection. + setter injection, and private field injection. . This package contains the API documentation for plexus-containers. It replaces the old packages libplexus-containers-default-java-doc. diff -Nru plexus-containers-1.0~beta3.0.7/debian/maven.rules plexus-containers-1.0~beta3.0.7/debian/maven.rules --- plexus-containers-1.0~beta3.0.7/debian/maven.rules 2009-07-04 15:04:43.000000000 +0000 +++ plexus-containers-1.0~beta3.0.7/debian/maven.rules 2013-09-23 07:47:27.000000000 +0000 @@ -1,4 +1,4 @@ -s/com.google.code.google-collections/com.google.collections/ s/google-collect/google-collections/ jar s/.*/debian/ +s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ jar s/.*/debian/ s/jdom/org.jdom/ jdom jar s/1\..*/debian/ junit junit jar s/3\..*/3.x/ diff -Nru plexus-containers-1.0~beta3.0.7/debian/rules plexus-containers-1.0~beta3.0.7/debian/rules --- plexus-containers-1.0~beta3.0.7/debian/rules 2011-05-31 00:22:27.000000000 +0000 +++ plexus-containers-1.0~beta3.0.7/debian/rules 2013-09-11 16:14:56.000000000 +0000 @@ -6,7 +6,7 @@ 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 @@ 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