[pkg-java] r17207 - in tags/libcommons-collections3-java: . 3.2.1-6/debian 3.2.1-6/debian/patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Mon Sep 9 19:24:12 UTC 2013
Author: ebourg-guest
Date: 2013-09-09 19:24:11 +0000 (Mon, 09 Sep 2013)
New Revision: 17207
Added:
tags/libcommons-collections3-java/3.2.1-6/
tags/libcommons-collections3-java/3.2.1-6/debian/ant.properties
tags/libcommons-collections3-java/3.2.1-6/debian/changelog
tags/libcommons-collections3-java/3.2.1-6/debian/compat
tags/libcommons-collections3-java/3.2.1-6/debian/control
tags/libcommons-collections3-java/3.2.1-6/debian/patches/OSGI_Manifest.diff
tags/libcommons-collections3-java/3.2.1-6/debian/patches/series
tags/libcommons-collections3-java/3.2.1-6/debian/rules
Removed:
tags/libcommons-collections3-java/3.2.1-6/debian/ant.properties
tags/libcommons-collections3-java/3.2.1-6/debian/changelog
tags/libcommons-collections3-java/3.2.1-6/debian/compat
tags/libcommons-collections3-java/3.2.1-6/debian/control
tags/libcommons-collections3-java/3.2.1-6/debian/patches/OSGI_Manifest.diff
tags/libcommons-collections3-java/3.2.1-6/debian/patches/disable_links.diff
tags/libcommons-collections3-java/3.2.1-6/debian/patches/series
tags/libcommons-collections3-java/3.2.1-6/debian/rules
Log:
[svn-buildpackage] Tagging libcommons-collections3-java 3.2.1-6
Deleted: tags/libcommons-collections3-java/3.2.1-6/debian/ant.properties
===================================================================
--- trunk/libcommons-collections3-java/debian/ant.properties 2013-09-09 08:51:11 UTC (rev 17202)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/ant.properties 2013-09-09 19:24:11 UTC (rev 17207)
@@ -1 +0,0 @@
-build.docs=build/docs/api
Copied: tags/libcommons-collections3-java/3.2.1-6/debian/ant.properties (from rev 17203, trunk/libcommons-collections3-java/debian/ant.properties)
===================================================================
--- tags/libcommons-collections3-java/3.2.1-6/debian/ant.properties (rev 0)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/ant.properties 2013-09-09 19:24:11 UTC (rev 17207)
@@ -0,0 +1,2 @@
+build.docs=build/docs/api
+javadoc.links=/usr/share/doc/default-jdk-doc/api
Deleted: tags/libcommons-collections3-java/3.2.1-6/debian/changelog
===================================================================
--- trunk/libcommons-collections3-java/debian/changelog 2013-09-09 08:51:11 UTC (rev 17202)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/changelog 2013-09-09 19:24:11 UTC (rev 17207)
@@ -1,137 +0,0 @@
-libcommons-collections3-java (3.2.1-5) unstable; urgency=low
-
- * Team upload.
- * Remove Arnaud from Uploaders list.
- * Remove Java runtime Depends.
- * Switch to source format 3.0.
-
- -- Torsten Werner <twerner at debian.org> Sun, 07 Aug 2011 01:47:37 +0200
-
-libcommons-collections3-java (3.2.1-4) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org> Sun, 09 Aug 2009 11:59:07 +0200
-
-libcommons-collections3-java (3.2.1-3) experimental; urgency=low
-
- [ Ludovic Claude ]
- * Change section to java, bump up Standards-Version to 3.8.1
- * Add the Maven POM to the package,
- * Add a Build-Depends-Indep dependency on maven-repo-helper
- * Use mh_installpom and mh_installjar to install the POM and the jar to the
- Maven repository
- * Add ${misc:Depends} to Depends to clear Lintian warnings
- * Patch src/conf/MANIFEST.MF: add the OSGi metadata generated by the Maven
- build, use quilt
- * Fix Lintian warning: Remove full text of Apache license
-
- [ Matthias Klose ]
- * (Build-)depend on default-jre/-jdk.
- * Set java source version to 1.4.
-
- [ Emmanuel Bourg ]
- * Update of the URLs
- * Rename Jakarta Commons to Apache Commons
-
- [ Torsten Werner ]
- * Convert debian/copyright to UTF-8.
- * Upload to experimental.
-
- -- Torsten Werner <twerner at debian.org> Sun, 12 Jul 2009 23:01:30 +0200
-
-libcommons-collections3-java (3.2.1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Varun Hiremath <varun at debian.org> Wed, 07 May 2008 00:21:02 +0530
-
-libcommons-collections3-java (3.2-1) unstable; urgency=low
-
- [ Kumar Appaiah ]
- * Add a watch file.
- * debian/control:
- + Add Xs-Vcs-Browser, Xs-Vcs-Svn.
- + Add Homepage field.
-
- [ Varun Hiremath ]
- * New upstream release
- * debian/control:
- + Build-Depends on debhelper >= 6
- + Bump up Standards-Version to 3.7.3
- + Remove Wolfgang Baer from Uploaders and add myself
- * debian/compat: Bump to 6
- * Add debian/orig-tar.sh to create orig.tar.gz
- * Remove debian/dirs file - not required
- * Remove debian/libcommons-collections3-java.links and create links from
- debian/rules to avoid hard coding the version in links file
- * Add debian/README.Debian-source
- * debian/rules:
- + clean up unused variables
- + create symlinks for the jars
- + implement get-orig-source target
- * Add patches/disable_links.diff to disable external links in build.xml
- while creating javadocs
- * debian/copyright: add copyright notice
-
- -- Varun Hiremath <varun at debian.org> Thu, 21 Feb 2008 13:41:10 +0530
-
-libcommons-collections3-java (3.1a-3.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * debian/control: rename first Build-Depends-Indep to Build-Depends and
- add junit to Build-Depends-Indep to fix FTBFS. (Closes: #384357)
-
- -- Arjan Oosting <arjanoosting at home.nl> Fri, 8 Sep 2006 00:05:17 +0200
-
-libcommons-collections3-java (3.1a-3) unstable; urgency=low
-
- * Added myself as an uploader
- * Build with java-gcj-compat-dev
- * Updated Standards-Version; put debhelper and cdbs in Build-Depends
- * Added tf.jar to the build (closes: #268223).
-
- -- Arnaud Vandyck <avdyk at debian.org> Tue, 1 Aug 2006 16:18:53 +0200
-
-libcommons-collections3-java (3.1a-2) unstable; urgency=low
-
- * Removed explicit usage of jikes build compiler property
- for kaffe jikes -> ecj transition
-
- -- Wolfgang Baer <WBaer at gmx.de> Fri, 6 Jan 2006 19:53:47 +0100
-
-libcommons-collections3-java (3.1a-1) unstable; urgency=low
-
- * Moved package to pkg-java-maintainers
- * Cleaned upstream tarball which contained the debian
- directory and all file after a build - added an 'a'
- to the upstream version to force an orig.tar.gz upgrade
- * Cleaned debian/rules
- * Bumped compat level to 4
- * License is actually Apache 2 - updated copyright
- * libant1.6-java to ant transition
- * Build apidocs and register with doc-base
- * Drop gjdoc patch - not needed anymore
- * Added myself to uploaders
- * Standards-Version 3.6.2 (no changes)
-
- -- Wolfgang Baer <WBaer at gmx.de> Sun, 25 Sep 2005 02:44:13 +0200
-
-libcommons-collections3-java (3.1-2) unstable; urgency=low
-
- * fixed FTBFS. (closes: #262271)
-
- -- Takashi Okamoto <tora at debian.org> Tue, 3 Aug 2004 00:45:16 +0900
-
-libcommons-collections3-java (3.1-1) unstable; urgency=low
-
- * New upstream release
-
- -- Takashi Okamoto <tora at debian.org> Thu, 8 Jul 2004 09:29:55 +0900
-
-libcommons-collections3-java (3.0-1) unstable; urgency=low
-
- * Initial Release. This is major version up from commons-collections 2.x.
- * closes request new release. (closes: #232531)
-
- -- Takashi Okamoto <tora at debian.org> Sun, 15 Feb 2004 11:53:58 +0900
Copied: tags/libcommons-collections3-java/3.2.1-6/debian/changelog (from rev 17203, trunk/libcommons-collections3-java/debian/changelog)
===================================================================
--- tags/libcommons-collections3-java/3.2.1-6/debian/changelog (rev 0)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/changelog 2013-09-09 19:24:11 UTC (rev 17207)
@@ -0,0 +1,150 @@
+libcommons-collections3-java (3.2.1-6) unstable; urgency=low
+
+ * debian/control:
+ - Build-Depends on debhelper >= 9
+ - Use canonical URLs for the Vcs-* fields
+ - Updated Standards-Version to 3.9.4 (no changes)
+ - Improved the description of the package
+ * debian/rules: Improved the clean target
+ * The Javadoc is now linked to the default JDK documentation
+ * Added a description to the patch OSGI_Manifest.diff
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 09 Sep 2013 15:47:25 +0200
+
+libcommons-collections3-java (3.2.1-5) unstable; urgency=low
+
+ * Team upload.
+ * Remove Arnaud from Uploaders list.
+ * Remove Java runtime Depends.
+ * Switch to source format 3.0.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 07 Aug 2011 01:47:37 +0200
+
+libcommons-collections3-java (3.2.1-4) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 09 Aug 2009 11:59:07 +0200
+
+libcommons-collections3-java (3.2.1-3) experimental; urgency=low
+
+ [ Ludovic Claude ]
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Add the Maven POM to the package,
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Patch src/conf/MANIFEST.MF: add the OSGi metadata generated by the Maven
+ build, use quilt
+ * Fix Lintian warning: Remove full text of Apache license
+
+ [ Matthias Klose ]
+ * (Build-)depend on default-jre/-jdk.
+ * Set java source version to 1.4.
+
+ [ Emmanuel Bourg ]
+ * Update of the URLs
+ * Rename Jakarta Commons to Apache Commons
+
+ [ Torsten Werner ]
+ * Convert debian/copyright to UTF-8.
+ * Upload to experimental.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 12 Jul 2009 23:01:30 +0200
+
+libcommons-collections3-java (3.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Varun Hiremath <varun at debian.org> Wed, 07 May 2008 00:21:02 +0530
+
+libcommons-collections3-java (3.2-1) unstable; urgency=low
+
+ [ Kumar Appaiah ]
+ * Add a watch file.
+ * debian/control:
+ + Add Xs-Vcs-Browser, Xs-Vcs-Svn.
+ + Add Homepage field.
+
+ [ Varun Hiremath ]
+ * New upstream release
+ * debian/control:
+ + Build-Depends on debhelper >= 6
+ + Bump up Standards-Version to 3.7.3
+ + Remove Wolfgang Baer from Uploaders and add myself
+ * debian/compat: Bump to 6
+ * Add debian/orig-tar.sh to create orig.tar.gz
+ * Remove debian/dirs file - not required
+ * Remove debian/libcommons-collections3-java.links and create links from
+ debian/rules to avoid hard coding the version in links file
+ * Add debian/README.Debian-source
+ * debian/rules:
+ + clean up unused variables
+ + create symlinks for the jars
+ + implement get-orig-source target
+ * Add patches/disable_links.diff to disable external links in build.xml
+ while creating javadocs
+ * debian/copyright: add copyright notice
+
+ -- Varun Hiremath <varun at debian.org> Thu, 21 Feb 2008 13:41:10 +0530
+
+libcommons-collections3-java (3.1a-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control: rename first Build-Depends-Indep to Build-Depends and
+ add junit to Build-Depends-Indep to fix FTBFS. (Closes: #384357)
+
+ -- Arjan Oosting <arjanoosting at home.nl> Fri, 8 Sep 2006 00:05:17 +0200
+
+libcommons-collections3-java (3.1a-3) unstable; urgency=low
+
+ * Added myself as an uploader
+ * Build with java-gcj-compat-dev
+ * Updated Standards-Version; put debhelper and cdbs in Build-Depends
+ * Added tf.jar to the build (closes: #268223).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 1 Aug 2006 16:18:53 +0200
+
+libcommons-collections3-java (3.1a-2) unstable; urgency=low
+
+ * Removed explicit usage of jikes build compiler property
+ for kaffe jikes -> ecj transition
+
+ -- Wolfgang Baer <WBaer at gmx.de> Fri, 6 Jan 2006 19:53:47 +0100
+
+libcommons-collections3-java (3.1a-1) unstable; urgency=low
+
+ * Moved package to pkg-java-maintainers
+ * Cleaned upstream tarball which contained the debian
+ directory and all file after a build - added an 'a'
+ to the upstream version to force an orig.tar.gz upgrade
+ * Cleaned debian/rules
+ * Bumped compat level to 4
+ * License is actually Apache 2 - updated copyright
+ * libant1.6-java to ant transition
+ * Build apidocs and register with doc-base
+ * Drop gjdoc patch - not needed anymore
+ * Added myself to uploaders
+ * Standards-Version 3.6.2 (no changes)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Sun, 25 Sep 2005 02:44:13 +0200
+
+libcommons-collections3-java (3.1-2) unstable; urgency=low
+
+ * fixed FTBFS. (closes: #262271)
+
+ -- Takashi Okamoto <tora at debian.org> Tue, 3 Aug 2004 00:45:16 +0900
+
+libcommons-collections3-java (3.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Takashi Okamoto <tora at debian.org> Thu, 8 Jul 2004 09:29:55 +0900
+
+libcommons-collections3-java (3.0-1) unstable; urgency=low
+
+ * Initial Release. This is major version up from commons-collections 2.x.
+ * closes request new release. (closes: #232531)
+
+ -- Takashi Okamoto <tora at debian.org> Sun, 15 Feb 2004 11:53:58 +0900
Deleted: tags/libcommons-collections3-java/3.2.1-6/debian/compat
===================================================================
--- trunk/libcommons-collections3-java/debian/compat 2013-09-09 08:51:11 UTC (rev 17202)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/compat 2013-09-09 19:24:11 UTC (rev 17207)
@@ -1 +0,0 @@
-6
Copied: tags/libcommons-collections3-java/3.2.1-6/debian/compat (from rev 17203, trunk/libcommons-collections3-java/debian/compat)
===================================================================
--- tags/libcommons-collections3-java/3.2.1-6/debian/compat (rev 0)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/compat 2013-09-09 19:24:11 UTC (rev 17207)
@@ -0,0 +1 @@
+9
Deleted: tags/libcommons-collections3-java/3.2.1-6/debian/control
===================================================================
--- trunk/libcommons-collections3-java/debian/control 2013-09-09 08:51:11 UTC (rev 17202)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/control 2013-09-09 19:24:11 UTC (rev 17207)
@@ -1,30 +0,0 @@
-Source: libcommons-collections3-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 6), cdbs, default-jdk
-Build-Depends-Indep: maven-repo-helper, ant, ant-optional, junit
-Standards-Version: 3.8.1
-Homepage: http://commons.apache.org/collections/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-collections3-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-collections3-java
-
-
-Package: libcommons-collections3-java
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: libcommons-collections3-java-doc
-Description: A 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-collections3-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Documentation for libcommons-collections3-java
- Javadocs for libcommons-collections3-java which is a Java
- collection framework.
Copied: tags/libcommons-collections3-java/3.2.1-6/debian/control (from rev 17203, trunk/libcommons-collections3-java/debian/control)
===================================================================
--- tags/libcommons-collections3-java/3.2.1-6/debian/control (rev 0)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/control 2013-09-09 19:24:11 UTC (rev 17207)
@@ -0,0 +1,49 @@
+Source: libcommons-collections3-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Varun Hiremath <varun at debian.org>, Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: debhelper (>= 9), cdbs, default-jdk
+Build-Depends-Indep: default-jdk-doc, maven-repo-helper, ant, ant-optional, junit
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-collections3-java
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-collections3-java
+Homepage: http://commons.apache.org/collections/
+
+Package: libcommons-collections3-java
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libcommons-collections3-java-doc
+Description: Apache Commons Collections - Extended Collections API for Java
+ The Java Collections Framework was a major addition in JDK 1.2. It added many
+ powerful data structures that accelerate development of most significant Java
+ applications. Since that time it has become the recognised standard for
+ collection handling in Java.
+ .
+ Commons Collections seek to build upon the JDK classes by providing new
+ interfaces, implementations and utilities. There are many features, including:
+ .
+ * Bag interface for collections that have a number of copies of each object
+ * BidiMap interface for maps that can be looked up from value to key as well
+ and key to value
+ * MapIterator interface to provide simple and quick iteration over maps
+ * Transforming decorators that alter each object as it is added to the
+ collection
+ * Composite collections that make multiple collections look like one
+ * Ordered maps and sets that retain the order elements are added in,
+ including an LRU based map
+ * Reference map that allows keys and/or values to be garbage collected under
+ close control
+ * Many comparator implementations
+ * Many iterator implementations
+ * Adapter classes from array and enumerations to collections
+ * Utilities to test or create typical set-theory properties of collections
+ such as union, intersection, and closure
+
+Package: libcommons-collections3-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Documentation for libcommons-collections3-java
+ Javadocs for libcommons-collections3-java which is a Java
+ collection framework.
Deleted: tags/libcommons-collections3-java/3.2.1-6/debian/patches/OSGI_Manifest.diff
===================================================================
--- trunk/libcommons-collections3-java/debian/patches/OSGI_Manifest.diff 2013-09-09 08:51:11 UTC (rev 17202)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/patches/OSGI_Manifest.diff 2013-09-09 19:24:11 UTC (rev 17207)
@@ -1,74 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -148,6 +148,7 @@
- <filter token="title" value="${component.title}"/>
- <filter token="package" value="${component.package}"/>
- <filter token="version" value="${component.version}"/>
-+ <filter token="lastmodified" value="${lastmodified}"/>
- </filterset>
- <fileset dir="${source.conf}" includes="*.MF"/>
- </copy>
---- a/src/conf/MANIFEST.MF
-+++ b/src/conf/MANIFEST.MF
-@@ -1,12 +1,48 @@
--Manifest-Version: 1.0
--Package: org.apache.commons.collections
--Extension-Name: commons-collections
--Specification-Version: @version@
--Specification-Vendor: Apache Software Foundation
--Specification-Title: Commons Collections
--Implementation-Version: @version@
--Implementation-Vendor: Apache Software Foundation
--Implementation-Title: Commons Collections
--Implementation-Vendor-Id: org.apache
--X-Compile-Source-JDK: 1.2
--X-Compile-Target-JDK: 1.2
-\ No newline at end of file
-+Manifest-Version: 1.0
-+Package: org.apache.commons.collections
-+Extension-Name: commons-collections
-+Specification-Version: @version@
-+Specification-Vendor: Apache Software Foundation
-+Specification-Title: Commons Collections
-+Implementation-Version: @version@
-+Implementation-Vendor: Apache Software Foundation
-+Implementation-Title: Commons Collections
-+Implementation-Vendor-Id: org.apache
-+X-Compile-Source-JDK: 1.2
-+X-Compile-Target-JDK: 1.2
-+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-+Import-Package: org.apache.commons.collections;version="@version@",
-+ org.apache.commons.collections.bag;version="@version@",
-+ org.apache.commons.collections.bidimap;version="@version@",
-+ org.apache.commons.collections.buffer;version="@version@",
-+ org.apache.commons.collections.collection;version="@version@",
-+ org.apache.commons.collections.comparators;version="@version@",
-+ org.apache.commons.collections.functors;version="@version@",
-+ org.apache.commons.collections.iterators;version="@version@",
-+ org.apache.commons.collections.keyvalue;version="@version@",
-+ org.apache.commons.collections.list;version="@version@",
-+ org.apache.commons.collections.map;version="@version@",
-+ org.apache.commons.collections.set;version="@version@"
-+Bnd-LastModified: @lastmodified@
-+Export-Package: org.apache.commons.collections.map;version="@version@",
-+ org.apache.commons.collections.buffer;version="@version@",
-+ org.apache.commons.collections.comparators;version="@version@",
-+ org.apache.commons.collections.collection;version="@version@",
-+ org.apache.commons.collections.bag;version="@version@",
-+ org.apache.commons.collections.iterators;version="@version@",
-+ org.apache.commons.collections.bidimap;version="@version@",
-+ org.apache.commons.collections.set;version="@version@",
-+ org.apache.commons.collections.functors;version="@version@",
-+ org.apache.commons.collections.list;version="@version@",
-+ org.apache.commons.collections.keyvalue;version="@version@",
-+ org.apache.commons.collections;version="@version@"
-+Bundle-Version: @version@
-+Bundle-Description: Types that extend and augment the Java Collections
-+ Framework.
-+Bundle-Name: Commons Collections
-+Bundle-DocURL: http://commons.apache.org/collections/
-+Bundle-ManifestVersion: 2
-+Bundle-Vendor: The Apache Software Foundation
-+Bundle-SymbolicName: org.apache.commons.collections
-+Tool: Bnd-0.0.238
-+
Copied: tags/libcommons-collections3-java/3.2.1-6/debian/patches/OSGI_Manifest.diff (from rev 17203, trunk/libcommons-collections3-java/debian/patches/OSGI_Manifest.diff)
===================================================================
--- tags/libcommons-collections3-java/3.2.1-6/debian/patches/OSGI_Manifest.diff (rev 0)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/patches/OSGI_Manifest.diff 2013-09-09 19:24:11 UTC (rev 17207)
@@ -0,0 +1,77 @@
+Description: Adds the OSGi metadata to the manifest
+Author: Ludovic Claude <ludovic.claude at laposte.net>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -148,6 +148,7 @@
+ <filter token="title" value="${component.title}"/>
+ <filter token="package" value="${component.package}"/>
+ <filter token="version" value="${component.version}"/>
++ <filter token="lastmodified" value="${lastmodified}"/>
+ </filterset>
+ <fileset dir="${source.conf}" includes="*.MF"/>
+ </copy>
+--- a/src/conf/MANIFEST.MF
++++ b/src/conf/MANIFEST.MF
+@@ -1,12 +1,48 @@
+-Manifest-Version: 1.0
+-Package: org.apache.commons.collections
+-Extension-Name: commons-collections
+-Specification-Version: @version@
+-Specification-Vendor: Apache Software Foundation
+-Specification-Title: Commons Collections
+-Implementation-Version: @version@
+-Implementation-Vendor: Apache Software Foundation
+-Implementation-Title: Commons Collections
+-Implementation-Vendor-Id: org.apache
+-X-Compile-Source-JDK: 1.2
+-X-Compile-Target-JDK: 1.2
+\ No newline at end of file
++Manifest-Version: 1.0
++Package: org.apache.commons.collections
++Extension-Name: commons-collections
++Specification-Version: @version@
++Specification-Vendor: Apache Software Foundation
++Specification-Title: Commons Collections
++Implementation-Version: @version@
++Implementation-Vendor: Apache Software Foundation
++Implementation-Title: Commons Collections
++Implementation-Vendor-Id: org.apache
++X-Compile-Source-JDK: 1.2
++X-Compile-Target-JDK: 1.2
++Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
++Import-Package: org.apache.commons.collections;version="@version@",
++ org.apache.commons.collections.bag;version="@version@",
++ org.apache.commons.collections.bidimap;version="@version@",
++ org.apache.commons.collections.buffer;version="@version@",
++ org.apache.commons.collections.collection;version="@version@",
++ org.apache.commons.collections.comparators;version="@version@",
++ org.apache.commons.collections.functors;version="@version@",
++ org.apache.commons.collections.iterators;version="@version@",
++ org.apache.commons.collections.keyvalue;version="@version@",
++ org.apache.commons.collections.list;version="@version@",
++ org.apache.commons.collections.map;version="@version@",
++ org.apache.commons.collections.set;version="@version@"
++Bnd-LastModified: @lastmodified@
++Export-Package: org.apache.commons.collections.map;version="@version@",
++ org.apache.commons.collections.buffer;version="@version@",
++ org.apache.commons.collections.comparators;version="@version@",
++ org.apache.commons.collections.collection;version="@version@",
++ org.apache.commons.collections.bag;version="@version@",
++ org.apache.commons.collections.iterators;version="@version@",
++ org.apache.commons.collections.bidimap;version="@version@",
++ org.apache.commons.collections.set;version="@version@",
++ org.apache.commons.collections.functors;version="@version@",
++ org.apache.commons.collections.list;version="@version@",
++ org.apache.commons.collections.keyvalue;version="@version@",
++ org.apache.commons.collections;version="@version@"
++Bundle-Version: @version@
++Bundle-Description: Types that extend and augment the Java Collections
++ Framework.
++Bundle-Name: Commons Collections
++Bundle-DocURL: http://commons.apache.org/collections/
++Bundle-ManifestVersion: 2
++Bundle-Vendor: The Apache Software Foundation
++Bundle-SymbolicName: org.apache.commons.collections
++Tool: Bnd-0.0.238
++
Deleted: tags/libcommons-collections3-java/3.2.1-6/debian/patches/disable_links.diff
===================================================================
--- trunk/libcommons-collections3-java/debian/patches/disable_links.diff 2013-09-09 08:51:11 UTC (rev 17202)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/patches/disable_links.diff 2013-09-09 19:24:11 UTC (rev 17207)
@@ -1,20 +0,0 @@
-Index: libcommons-collections3-java-3.2/build.xml
-===================================================================
---- libcommons-collections3-java-3.2.orig/build.xml 2008-01-16 11:03:39.000000000 +0530
-+++ libcommons-collections3-java-3.2/build.xml 2008-01-16 11:03:47.000000000 +0530
-@@ -358,7 +358,6 @@
- author="true"
- version="true"
- use="true"
-- link="${javadoc.links}"
- overview="${source.java}/org/apache/commons/collections/overview.html"
- doctitle="${component.title} ${component.version} API;"
- windowtitle="${component.title} ${component.version} API"
-@@ -466,7 +465,6 @@
- access="protected"
- author="false"
- version="false"
-- link="${javadoc.links}"
- overview="${source.test}/org/apache/commons/collections/overview.html"
- doctitle="${tf.title} ${tf.version} API;"
- windowtitle="${tf.title} ${tf.version} API"
Deleted: tags/libcommons-collections3-java/3.2.1-6/debian/patches/series
===================================================================
--- trunk/libcommons-collections3-java/debian/patches/series 2013-09-09 08:51:11 UTC (rev 17202)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/patches/series 2013-09-09 19:24:11 UTC (rev 17207)
@@ -1,2 +0,0 @@
-OSGI_Manifest.diff
-disable_links.diff
Copied: tags/libcommons-collections3-java/3.2.1-6/debian/patches/series (from rev 17203, trunk/libcommons-collections3-java/debian/patches/series)
===================================================================
--- tags/libcommons-collections3-java/3.2.1-6/debian/patches/series (rev 0)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/patches/series 2013-09-09 19:24:11 UTC (rev 17207)
@@ -0,0 +1 @@
+OSGI_Manifest.diff
Deleted: tags/libcommons-collections3-java/3.2.1-6/debian/rules
===================================================================
--- trunk/libcommons-collections3-java/debian/rules 2013-09-09 08:51:11 UTC (rev 17202)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/rules 2013-09-09 19:24:11 UTC (rev 17207)
@@ -1,31 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules file for libcommons-collections3-java (uses cdbs)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit
-DEB_ANT_BUILD_TARGET := jar tf.jar javadoc
-LAST_MODIFIED := $(shell date +%s%N | cut -c -13)
-DEB_ANT_ARGS := -Dlastmodified=$(LAST_MODIFIED)
-ANT_OPTS = -Dant.build.javac.source=1.4
-
-clean::
- -rm -f debian/files
- -rm -f TEST-*
- -rm -rf debian/tmp
-
-install/libcommons-collections3-java::
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l --usj-name=commons-collections3 pom.xml build/commons-collections-$(VERSION).jar
- install -D -m644 $(DEB_SRCDIR)/build/commons-collections-testframework-[0-9]*.jar \
- debian/libcommons-collections3-java/usr/share/java/commons-collections3-testframework-$(DEB_UPSTREAM_VERSION).jar
- dh_link /usr/share/java//commons-collections3-testframework-$(DEB_UPSTREAM_VERSION).jar \
- /usr/share/java//commons-collections3-testframework.jar
-
-get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
Copied: tags/libcommons-collections3-java/3.2.1-6/debian/rules (from rev 17203, trunk/libcommons-collections3-java/debian/rules)
===================================================================
--- tags/libcommons-collections3-java/3.2.1-6/debian/rules (rev 0)
+++ tags/libcommons-collections3-java/3.2.1-6/debian/rules 2013-09-09 19:24:11 UTC (rev 17207)
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+# debian/rules file for libcommons-collections3-java (uses cdbs)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit
+DEB_ANT_BUILD_TARGET := jar tf.jar javadoc
+LAST_MODIFIED := $(shell date +%s%N | cut -c -13)
+DEB_ANT_ARGS := -Dlastmodified=$(LAST_MODIFIED)
+ANT_OPTS = -Dant.build.javac.source=1.4
+
+clean::
+ mh_clean
+ -rm -f debian/files
+ -rm -f TEST-*
+ -rm -rf debian/tmp
+
+install/libcommons-collections3-java::
+ mh_installpoms -p$(PACKAGE)
+ mh_installjar -p$(PACKAGE) -l --usj-name=commons-collections3 pom.xml build/commons-collections-$(VERSION).jar
+ install -D -m644 $(DEB_SRCDIR)/build/commons-collections-testframework-[0-9]*.jar \
+ debian/libcommons-collections3-java/usr/share/java/commons-collections3-testframework-$(DEB_UPSTREAM_VERSION).jar
+ dh_link /usr/share/java//commons-collections3-testframework-$(DEB_UPSTREAM_VERSION).jar \
+ /usr/share/java//commons-collections3-testframework.jar
+
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
More information about the pkg-java-commits
mailing list