Author: drazzib Date: 2011-04-25 12:42:00 +0000 (Mon, 25 Apr 2011) New Revision: 13581
Added: trunk/libcommons-collections-java/debian/libcommons-collections-java-doc.doc-base trunk/libcommons-collections-java/debian/libcommons-collections-java-doc.install trunk/libcommons-collections-java/debian/libcommons-collections-java.poms trunk/libcommons-collections-java/debian/maven.rules trunk/libcommons-collections-java/debian/patches/series trunk/libcommons-collections-java/debian/poms/ trunk/libcommons-collections-java/debian/poms/commons-collections.pom trunk/libcommons-collections-java/debian/source/ trunk/libcommons-collections-java/debian/source/format Removed: trunk/libcommons-collections-java/debian/dirs trunk/libcommons-collections-java/debian/doc-base trunk/libcommons-collections-java/debian/links Modified: trunk/libcommons-collections-java/debian/changelog trunk/libcommons-collections-java/debian/control trunk/libcommons-collections-java/debian/docs trunk/libcommons-collections-java/debian/patches/01_javadoc_link.patch trunk/libcommons-collections-java/debian/rules Log: * Team upload. * Apply patch from James Pages <james.p...@canonical.com>. Thanks : * Enabled maven artifact deployment (LP: #717157) (Closes: #612916): - debian/control: Build-Depends added maven-repo-helper - debian/rules: install maven artifacts and new target to retrieve original POM file. - debian/poms/commons-collections.pom: localised pom for maven - debian/libcommons-collections-java.poms: pom reference locations - debian/{links,dirs}: drop. * Update Standards-Version: 3.9.2, no changes. * Updated to source/format: 3.0 (quilt): - Add missing debian/patches/series. * Drop Arnaud Vandyck from Uploaders (Thanks for your work !). * Drop Depends on JRE since it's a library (as per Debian Java Policy). * Split package to get a libcommons-collections-java-doc package for documentation (Javadoc). Modified: trunk/libcommons-collections-java/debian/changelog =================================================================== --- trunk/libcommons-collections-java/debian/changelog 2011-04-25 12:15:50 UTC (rev 13580) +++ trunk/libcommons-collections-java/debian/changelog 2011-04-25 12:42:00 UTC (rev 13581) @@ -1,3 +1,24 @@ +libcommons-collections-java (2.1.1-10) unstable; urgency=low + + * Team upload. + * Apply patch from James Pages <james.p...@canonical.com>. Thanks : + * Enabled maven artifact deployment (LP: #717157) (Closes: #612916): + - debian/control: Build-Depends added maven-repo-helper + - debian/rules: install maven artifacts and new target to retrieve + original POM file. + - debian/poms/commons-collections.pom: localised pom for maven + - debian/libcommons-collections-java.poms: pom reference locations + - debian/{links,dirs}: drop. + * Update Standards-Version: 3.9.2, no changes. + * Updated to source/format: 3.0 (quilt): + - Add missing debian/patches/series. + * Drop Arnaud Vandyck from Uploaders (Thanks for your work !). + * Drop Depends on JRE since it's a library (as per Debian Java Policy). + * Split package to get a libcommons-collections-java-doc package for + documentation (Javadoc). + + -- Damien Raude-Morvan <draz...@debian.org> Mon, 25 Apr 2011 14:36:58 +0200 + libcommons-collections-java (2.1.1-9) unstable; urgency=low [ Onkar Shinde ] Modified: trunk/libcommons-collections-java/debian/control =================================================================== --- trunk/libcommons-collections-java/debian/control 2011-04-25 12:15:50 UTC (rev 13580) +++ trunk/libcommons-collections-java/debian/control 2011-04-25 12:42:00 UTC (rev 13581) @@ -2,16 +2,33 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de> -Build-Depends: debhelper (>= 5), cdbs +Uploaders: Michael Koch <konque...@gmx.de> +Build-Depends: debhelper (>= 5), cdbs, maven-repo-helper Build-Depends-Indep: ant, default-jdk -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 +Homepage: http://commons.apache.org/collections/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-collections-java +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-collections-java Package: libcommons-collections-java Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless -Description: A set of abstract data type interfaces and implementations +Depends: ${misc:Depends} +Suggests: libcommons-collections-java-doc +Description: set of abstract data type interfaces and implementations The Java Collections Framework provides a set of abstract data type interfaces and implementations that offer both a wealth of useful functionality, and a solid foundation for extending that functionality. + +Package: libcommons-collections-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Description: set of abstract data type interfaces and implementations - doc + The Java Collections Framework provides a set of abstract data + type interfaces and implementations that offer both a wealth + of useful functionality, and a solid foundation for extending + that functionality. + . + This package contains Javadoc API documentation for + libcommons-collections-java package. \ No newline at end of file Deleted: trunk/libcommons-collections-java/debian/dirs =================================================================== --- trunk/libcommons-collections-java/debian/dirs 2011-04-25 12:15:50 UTC (rev 13580) +++ trunk/libcommons-collections-java/debian/dirs 2011-04-25 12:42:00 UTC (rev 13581) @@ -1 +0,0 @@ -usr/share/java Deleted: trunk/libcommons-collections-java/debian/doc-base =================================================================== --- trunk/libcommons-collections-java/debian/doc-base 2011-04-25 12:15:50 UTC (rev 13580) +++ trunk/libcommons-collections-java/debian/doc-base 2011-04-25 12:42:00 UTC (rev 13581) @@ -1,10 +0,0 @@ -Document: libcommons-collections-java -Title: Programmer API for libcommons-collections-java -Author: Apache Commons Developer Team -Abstract: Javadocs programmer API of libcommons-collections-java, - a set of abstract data type interfaces and implementations. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libcommons-collections-java/api/index.html -Files: /usr/share/doc/libcommons-collections-java/api/*.html Modified: trunk/libcommons-collections-java/debian/docs =================================================================== --- trunk/libcommons-collections-java/debian/docs 2011-04-25 12:15:50 UTC (rev 13580) +++ trunk/libcommons-collections-java/debian/docs 2011-04-25 12:42:00 UTC (rev 13581) @@ -1,3 +1 @@ dist/docs/api -STATUS.html -RELEASE-NOTES-2.1.1.html Copied: trunk/libcommons-collections-java/debian/libcommons-collections-java-doc.doc-base (from rev 13573, trunk/libcommons-collections-java/debian/doc-base) =================================================================== --- trunk/libcommons-collections-java/debian/libcommons-collections-java-doc.doc-base (rev 0) +++ trunk/libcommons-collections-java/debian/libcommons-collections-java-doc.doc-base 2011-04-25 12:42:00 UTC (rev 13581) @@ -0,0 +1,10 @@ +Document: libcommons-collections-java +Title: Programmer API for libcommons-collections-java +Author: Apache Commons Developer Team +Abstract: Javadocs programmer API of libcommons-collections-java, + a set of abstract data type interfaces and implementations. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-collections-java/api/index.html +Files: /usr/share/doc/libcommons-collections-java/api/*.html Copied: trunk/libcommons-collections-java/debian/libcommons-collections-java-doc.install (from rev 13573, trunk/libcommons-collections-java/debian/docs) =================================================================== --- trunk/libcommons-collections-java/debian/libcommons-collections-java-doc.install (rev 0) +++ trunk/libcommons-collections-java/debian/libcommons-collections-java-doc.install 2011-04-25 12:42:00 UTC (rev 13581) @@ -0,0 +1 @@ +dist/docs/api /usr/share/doc/libcommons-collections-java/ Added: trunk/libcommons-collections-java/debian/libcommons-collections-java.poms =================================================================== --- trunk/libcommons-collections-java/debian/libcommons-collections-java.poms (rev 0) +++ trunk/libcommons-collections-java/debian/libcommons-collections-java.poms 2011-04-25 12:42:00 UTC (rev 13581) @@ -0,0 +1 @@ +debian/poms/commons-collections.pom Deleted: trunk/libcommons-collections-java/debian/links =================================================================== --- trunk/libcommons-collections-java/debian/links 2011-04-25 12:15:50 UTC (rev 13580) +++ trunk/libcommons-collections-java/debian/links 2011-04-25 12:42:00 UTC (rev 13581) @@ -1 +0,0 @@ -usr/share/java/commons-collections-2.1.1.jar usr/share/java/commons-collections.jar Added: trunk/libcommons-collections-java/debian/maven.rules =================================================================== --- trunk/libcommons-collections-java/debian/maven.rules (rev 0) +++ trunk/libcommons-collections-java/debian/maven.rules 2011-04-25 12:42:00 UTC (rev 13581) @@ -0,0 +1 @@ +commons-collections commons-collections * s/2\..*/2.x/ * * Modified: trunk/libcommons-collections-java/debian/patches/01_javadoc_link.patch =================================================================== --- trunk/libcommons-collections-java/debian/patches/01_javadoc_link.patch 2011-04-25 12:15:50 UTC (rev 13580) +++ trunk/libcommons-collections-java/debian/patches/01_javadoc_link.patch 2011-04-25 12:42:00 UTC (rev 13581) @@ -1,5 +1,5 @@ ---- build.xml.orig 2007-09-30 23:25:22.000000000 +0200 -+++ build.xml 2007-09-30 23:25:36.000000000 +0200 +--- a/build.xml ++++ b/build.xml @@ -190,7 +190,6 @@ nonavbar="false" serialwarn="false"> Added: trunk/libcommons-collections-java/debian/patches/series =================================================================== --- trunk/libcommons-collections-java/debian/patches/series (rev 0) +++ trunk/libcommons-collections-java/debian/patches/series 2011-04-25 12:42:00 UTC (rev 13581) @@ -0,0 +1 @@ +01_javadoc_link.patch Added: trunk/libcommons-collections-java/debian/poms/commons-collections.pom =================================================================== --- trunk/libcommons-collections-java/debian/poms/commons-collections.pom (rev 0) +++ trunk/libcommons-collections-java/debian/poms/commons-collections.pom 2011-04-25 12:42:00 UTC (rev 13581) @@ -0,0 +1,6 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>2.1.1</version> +</project> \ No newline at end of file Modified: trunk/libcommons-collections-java/debian/rules =================================================================== --- trunk/libcommons-collections-java/debian/rules 2011-04-25 12:15:50 UTC (rev 13580) +++ trunk/libcommons-collections-java/debian/rules 2011-04-25 12:42:00 UTC (rev 13581) @@ -3,7 +3,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant @@ -11,6 +10,17 @@ DEB_JARS := log4j-1.2 logkit servlet-2.3 DEB_ANT_BUILD_TARGET := dist-jar doc +MAVEN_REPO := http://repo1.maven.org/maven2 +PACKAGE := commons-collections + install/libcommons-collections-java:: - install -m 644 dist/commons-collections-2.1.1.jar debian/libcommons-collections-java/usr/share/java/commons-collections-2.1.1.jar + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom dist/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar +clean:: + mh_clean + +get-orig-pom: + mkdir -p debian/poms + wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \ + $(MAVEN_REPO)/$(PACKAGE)/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom Added: trunk/libcommons-collections-java/debian/source/format =================================================================== --- trunk/libcommons-collections-java/debian/source/format (rev 0) +++ trunk/libcommons-collections-java/debian/source/format 2011-04-25 12:42:00 UTC (rev 13581) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits