[pkg-java] r8761 - in trunk/libcommons-collections3-java/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Thu Jul 2 11:37:43 UTC 2009
Author: ludovicc-guest
Date: 2009-07-02 11:37:43 +0000 (Thu, 02 Jul 2009)
New Revision: 8761
Added:
trunk/libcommons-collections3-java/debian/libcommons-collections3-java.poms
trunk/libcommons-collections3-java/debian/maven.rules
trunk/libcommons-collections3-java/debian/patches/OSGI_Manifest.diff
Modified:
trunk/libcommons-collections3-java/debian/changelog
trunk/libcommons-collections3-java/debian/control
trunk/libcommons-collections3-java/debian/patches/series
trunk/libcommons-collections3-java/debian/rules
Log:
* New version
Modified: trunk/libcommons-collections3-java/debian/changelog
===================================================================
--- trunk/libcommons-collections3-java/debian/changelog 2009-07-02 11:17:03 UTC (rev 8760)
+++ trunk/libcommons-collections3-java/debian/changelog 2009-07-02 11:37:43 UTC (rev 8761)
@@ -1,3 +1,17 @@
+libcommons-collections3-java (3.2.1-3) unstable; urgency=low
+
+ * 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
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 03 May 2009 17:21:41 +0100
+
libcommons-collections3-java (3.2.1-2) UNRELEASED; urgency=low
* (Build-)depend on default-jre/-jdk.
Modified: trunk/libcommons-collections3-java/debian/control
===================================================================
--- trunk/libcommons-collections3-java/debian/control 2009-07-02 11:17:03 UTC (rev 8760)
+++ trunk/libcommons-collections3-java/debian/control 2009-07-02 11:37:43 UTC (rev 8761)
@@ -1,11 +1,11 @@
Source: libcommons-collections3-java
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <avdyk at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 6), cdbs, quilt
-Build-Depends-Indep: ant, ant-optional, default-jdk, junit
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 6), cdbs, quilt, 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
@@ -13,8 +13,7 @@
Package: libcommons-collections3-java
Architecture: all
-Section: libs
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
+Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless
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
@@ -25,6 +24,7 @@
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.
Added: trunk/libcommons-collections3-java/debian/libcommons-collections3-java.poms
===================================================================
--- trunk/libcommons-collections3-java/debian/libcommons-collections3-java.poms (rev 0)
+++ trunk/libcommons-collections3-java/debian/libcommons-collections3-java.poms 2009-07-02 11:37:43 UTC (rev 8761)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/libcommons-collections3-java/debian/maven.rules
===================================================================
--- trunk/libcommons-collections3-java/debian/maven.rules (rev 0)
+++ trunk/libcommons-collections3-java/debian/maven.rules 2009-07-02 11:37:43 UTC (rev 8761)
@@ -0,0 +1,2 @@
+commons-collections commons-collections jar s/3\..*/3.x/
+junit junit jar s/3\..*/3.x/
Added: trunk/libcommons-collections3-java/debian/patches/OSGI_Manifest.diff
===================================================================
--- trunk/libcommons-collections3-java/debian/patches/OSGI_Manifest.diff (rev 0)
+++ trunk/libcommons-collections3-java/debian/patches/OSGI_Manifest.diff 2009-07-02 11:37:43 UTC (rev 8761)
@@ -0,0 +1,74 @@
+--- 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
++
Modified: trunk/libcommons-collections3-java/debian/patches/series
===================================================================
--- trunk/libcommons-collections3-java/debian/patches/series 2009-07-02 11:17:03 UTC (rev 8760)
+++ trunk/libcommons-collections3-java/debian/patches/series 2009-07-02 11:37:43 UTC (rev 8761)
@@ -1 +1,2 @@
+OSGI_Manifest.diff
disable_links.diff
Modified: trunk/libcommons-collections3-java/debian/rules
===================================================================
--- trunk/libcommons-collections3-java/debian/rules 2009-07-02 11:17:03 UTC (rev 8760)
+++ trunk/libcommons-collections3-java/debian/rules 2009-07-02 11:37:43 UTC (rev 8761)
@@ -5,25 +5,28 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit
+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 -f debian/files
+ -rm -f TEST-*
+ -rm -rf debian/tmp
install/libcommons-collections3-java::
- install -D -m644 $(DEB_SRCDIR)/build/commons-collections-[0-9]*.jar \
- debian/libcommons-collections3-java/usr/share/java/commons-collections3-$(DEB_UPSTREAM_VERSION).jar
+ 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-$(DEB_UPSTREAM_VERSION).jar \
- /usr/share/java/commons-collections3.jar
dh_link /usr/share/java//commons-collections3-testframework-$(DEB_UPSTREAM_VERSION).jar \
/usr/share/java//commons-collections3-testframework.jar
get-orig-source:
- -uscan --upstream-version 0 --rename
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
More information about the pkg-java-commits
mailing list