Author: ludovicc-guest Date: 2009-07-02 12:07:30 +0000 (Thu, 02 Jul 2009) New Revision: 8769
Added: trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.doc-base trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.docs trunk/libcommons-lang-java/debian/libcommons-lang-java.poms trunk/libcommons-lang-java/debian/maven.rules trunk/libcommons-lang-java/debian/patches/OSGi_Manifest.patch trunk/libcommons-lang-java/debian/patches/series Removed: trunk/libcommons-lang-java/debian/dirs trunk/libcommons-lang-java/debian/docs trunk/libcommons-lang-java/debian/patches/00list trunk/libcommons-lang-java/debian/patches/01build_xml_license_location_patch.dpatch Modified: trunk/libcommons-lang-java/debian/README.Debian trunk/libcommons-lang-java/debian/changelog trunk/libcommons-lang-java/debian/compat trunk/libcommons-lang-java/debian/copyright trunk/libcommons-lang-java/debian/rules Log: * New version Modified: trunk/libcommons-lang-java/debian/README.Debian =================================================================== --- trunk/libcommons-lang-java/debian/README.Debian 2009-07-02 12:05:19 UTC (rev 8768) +++ trunk/libcommons-lang-java/debian/README.Debian 2009-07-02 12:07:30 UTC (rev 8769) @@ -5,3 +5,9 @@ is no more generated (the package is not generated by ant at the moment) -- Arnaud Vandyck <[email protected]>, Sat Nov 8 18:38:30 2003 + +debian/MANIFEST.MF has been extracted from the official commons-lang.jar and +it may need to be updated for new releases. + + -- Ludovic Claude <[email protected]> Sun, 03 May 2009 17:21:41 +0100 + Modified: trunk/libcommons-lang-java/debian/changelog =================================================================== --- trunk/libcommons-lang-java/debian/changelog 2009-07-02 12:05:19 UTC (rev 8768) +++ trunk/libcommons-lang-java/debian/changelog 2009-07-02 12:07:30 UTC (rev 8769) @@ -1,5 +1,21 @@ -libcommons-lang-java (2.4-2) UNRELEASED; urgency=low +libcommons-lang-java (2.4-2) 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 + * Add ${misc:Depends} to Depends to clear Lintian warnings + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + * Remove 01build_xml_license_location_patch.dpatch as it's not useful + anymore + * Patch src/conf/MANIFEST.MF: add the OSGi metadata generated by the Maven + build, use quilt + * Put the API documentation in a separate package + + -- Ludovic Claude <[email protected]> Sun, 03 May 2009 17:21:41 +0100 + +libcommons-lang-java (2.4-1ubuntu1) intrepid; urgency=low + * (Build-)depend on default-jre/-jdk. [ Emmanuel Bourg ] @@ -7,7 +23,7 @@ * Rename Jakarta Commons to Apache Commons * debian/copyright: Switch to Apache License 2.0. Closes: #532885. - -- Matthias Klose <[email protected]> Wed, 30 Jul 2008 15:58:22 +0000 + -- Matthias Klose <[email protected]> Wed, 30 Jul 2008 15:58:22 +0000 libcommons-lang-java (2.4-1) unstable; urgency=low Modified: trunk/libcommons-lang-java/debian/compat =================================================================== --- trunk/libcommons-lang-java/debian/compat 2009-07-02 12:05:19 UTC (rev 8768) +++ trunk/libcommons-lang-java/debian/compat 2009-07-02 12:07:30 UTC (rev 8769) @@ -1 +1 @@ -5 +6 Modified: trunk/libcommons-lang-java/debian/copyright =================================================================== --- trunk/libcommons-lang-java/debian/copyright 2009-07-02 12:05:19 UTC (rev 8768) +++ trunk/libcommons-lang-java/debian/copyright 2009-07-02 12:07:30 UTC (rev 8769) @@ -35,7 +35,7 @@ Masato Tezuka, Jeff Varszegi, Chris Webb, Mario Winterer, Stepan Koltsov, Holger Hoffstatte -Copyright: � 2001-2008 The Apache Software Foundation +Copyright: 2001-2008 The Apache Software Foundation License: Apache 2.0 Deleted: trunk/libcommons-lang-java/debian/dirs =================================================================== --- trunk/libcommons-lang-java/debian/dirs 2009-07-02 12:05:19 UTC (rev 8768) +++ trunk/libcommons-lang-java/debian/dirs 2009-07-02 12:07:30 UTC (rev 8769) @@ -1 +0,0 @@ -usr/share/java Deleted: trunk/libcommons-lang-java/debian/docs =================================================================== --- trunk/libcommons-lang-java/debian/docs 2009-07-02 12:05:19 UTC (rev 8768) +++ trunk/libcommons-lang-java/debian/docs 2009-07-02 12:07:30 UTC (rev 8769) @@ -1 +0,0 @@ -dist/docs/api Added: trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.doc-base =================================================================== --- trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.doc-base (rev 0) +++ trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.doc-base 2009-07-02 12:07:30 UTC (rev 8769) @@ -0,0 +1,11 @@ +Document: libcommons-lang-java +Title: Programmer API for Commons Lang +Author: Apache Commons Lang developers +Abstract: The Lang Component contains a set of Java classes that provide helper + methods for standard Java classes, especially those found in the + java.lang package in the Sun JDK. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-lang-java-doc/api/index.html +Files: /usr/share/doc/libcommons-lang-java-doc/api/* Added: trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.docs =================================================================== --- trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.docs (rev 0) +++ trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.docs 2009-07-02 12:07:30 UTC (rev 8769) @@ -0,0 +1 @@ +dist/docs/api Added: trunk/libcommons-lang-java/debian/libcommons-lang-java.poms =================================================================== --- trunk/libcommons-lang-java/debian/libcommons-lang-java.poms (rev 0) +++ trunk/libcommons-lang-java/debian/libcommons-lang-java.poms 2009-07-02 12:07:30 UTC (rev 8769) @@ -0,0 +1 @@ +pom.xml --no-parent Added: trunk/libcommons-lang-java/debian/maven.rules =================================================================== --- trunk/libcommons-lang-java/debian/maven.rules (rev 0) +++ trunk/libcommons-lang-java/debian/maven.rules 2009-07-02 12:07:30 UTC (rev 8769) @@ -0,0 +1,2 @@ +junit junit jar s/3\..*/3.x/ + Deleted: trunk/libcommons-lang-java/debian/patches/00list =================================================================== --- trunk/libcommons-lang-java/debian/patches/00list 2009-07-02 12:05:19 UTC (rev 8768) +++ trunk/libcommons-lang-java/debian/patches/00list 2009-07-02 12:07:30 UTC (rev 8769) @@ -1 +0,0 @@ -01build_xml_entities_fix Deleted: trunk/libcommons-lang-java/debian/patches/01build_xml_license_location_patch.dpatch =================================================================== --- trunk/libcommons-lang-java/debian/patches/01build_xml_license_location_patch.dpatch 2009-07-02 12:05:19 UTC (rev 8768) +++ trunk/libcommons-lang-java/debian/patches/01build_xml_license_location_patch.dpatch 2009-07-02 12:07:30 UTC (rev 8769) @@ -1,46 +0,0 @@ -#!/bin/sh -e -## 01build_xml_license_location_patch.dpatch by Arnaud Vandyck <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: LICENSE file is not in upper directory - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -...@dpatch@ -diff -urNad /home/arnaud/debian/ITP/jakarta/libcommons-lang-java-1.0.1/lang/build.xml libcommons-lang-java-1.0.1/lang/build.xml ---- /home/arnaud/debian/ITP/jakarta/libcommons-lang-java-1.0.1/lang/build.xml 2003-07-01 15:42:59.000000000 +0200 -+++ libcommons-lang-java-1.0.1/lang/build.xml 2003-07-01 15:45:48.000000000 +0200 -@@ -120,7 +120,7 @@ - <target name="dist" depends="compile,javadoc" - description="Create binary distribution"> - <mkdir dir="${dist.home}"/> -- <copy file="../LICENSE" -+ <copy file="LICENSE.txt" - todir="${dist.home}"/> - <copy file="RELEASE-NOTES.txt" - todir="${dist.home}"/> -@@ -132,7 +132,7 @@ - description="Create jar"> - <mkdir dir="${dist.home}"/> - <mkdir dir="${build.home}/classes/META-INF"/> -- <copy file="../LICENSE" -+ <copy file="LICENSE.txt" - tofile="${build.home}/classes/META-INF/LICENSE.txt"/> - <jar jarfile="${dist.home}/${final.name}.jar" - basedir="${build.home}/classes" Added: trunk/libcommons-lang-java/debian/patches/OSGi_Manifest.patch =================================================================== --- trunk/libcommons-lang-java/debian/patches/OSGi_Manifest.patch (rev 0) +++ trunk/libcommons-lang-java/debian/patches/OSGi_Manifest.patch 2009-07-02 12:07:30 UTC (rev 8769) @@ -0,0 +1,46 @@ +--- a/src/conf/MANIFEST.MF ++++ b/src/conf/MANIFEST.MF +@@ -10,3 +10,33 @@ + Implementation-Vendor-Id: org.apache + X-Compile-Source-JDK: @compile.source@ + X-Compile-Target-JDK: @compile.target@ ++Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt ++Import-Package: org.apache.commons.lang;version="@version@", ++ org.apache.commons.lang.builder;version="@version@", ++ org.apache.commons.lang.enum;version="@version@", ++ org.apache.commons.lang.enums;version="@version@", ++ org.apache.commons.lang.exception;version="@version@", ++ org.apache.commons.lang.math;version="@version@", ++ org.apache.commons.lang.mutable;version="@version@", ++ org.apache.commons.lang.text;version="@version@", ++ org.apache.commons.lang.time;version="@version@" ++Bnd-LastModified: @lastmodified@ ++Export-Package: org.apache.commons.lang.math;version="@version@", ++ org.apache.commons.lang.enums;version="@version@", ++ org.apache.commons.lang.builder;version="@version@", ++ org.apache.commons.lang.exception;version="@version@", ++ org.apache.commons.lang.enum;version="@version@", ++ org.apache.commons.lang.mutable;version="@version@", ++ org.apache.commons.lang.text;version="@version@", ++ org.apache.commons.lang.time;version="@version@", ++ org.apache.commons.lang;version="@version@" ++Bundle-Version: @version@ ++Bundle-Description: Commons Lang, a package of Java utility classes fo ++ r the classes that are in java.lang's hierarchy, or are considered ++ to be so standard as to justify existence in java.lang. ++Bundle-Name: Commons Lang ++Bundle-DocURL: http://commons.apache.org/lang/ ++Bundle-ManifestVersion: 2 ++Bundle-Vendor: The Apache Software Foundation ++Bundle-SymbolicName: org.apache.commons.lang ++Tool: Bnd-0.0.238 +--- a/build.xml ++++ b/build.xml +@@ -48,6 +48,7 @@ + <filter token="version" value="${component.version}"/> + <filter token="compile.source" value="${compile.source}"/> + <filter token="compile.target" value="${compile.target}"/> ++ <filter token="lastmodified" value="${lastmodified}"/> + </target> + <target name="prepare" depends="init" description="Prepare build directory"> + <mkdir dir="${build.home}"/> Added: trunk/libcommons-lang-java/debian/patches/series =================================================================== --- trunk/libcommons-lang-java/debian/patches/series (rev 0) +++ trunk/libcommons-lang-java/debian/patches/series 2009-07-02 12:07:30 UTC (rev 8769) @@ -0,0 +1 @@ +OSGi_Manifest.patch Modified: trunk/libcommons-lang-java/debian/rules =================================================================== --- trunk/libcommons-lang-java/debian/rules 2009-07-02 12:05:19 UTC (rev 8768) +++ trunk/libcommons-lang-java/debian/rules 2009-07-02 12:07:30 UTC (rev 8769) @@ -1,18 +1,26 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk 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 := junit +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := junit DEB_ANT_BUILD_TARGET := jar javadoc +LAST_MODIFIED := $(shell date +%s%N | cut -c -13) +DEB_ANT_ARGS := -Dlastmodified=$(LAST_MODIFIED) install/libcommons-lang-java:: - install -m 644 dist/commons-lang-${DEB_UPSTREAM_VERSION}.jar debian/libcommons-lang-java/usr/share/java/commons-lang-${DEB_UPSTREAM_VERSION}.jar - dh_link -p libcommons-lang-java usr/share/java/commons-lang-${DEB_UPSTREAM_VERSION}.jar usr/share/java/commons-lang.jar + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -l pom.xml dist/commons-lang-$(VERSION).jar clean:: -rm gjdoc_rawcomment.cache -rm -rf docs/api/* + -rm -rf debian/tmp + +get-orig-source: + -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename +
_______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
