Author: nomadium-guest Date: 2011-08-02 16:51:38 +0000 (Tue, 02 Aug 2011) New Revision: 13899
Added: trunk/libcommons-lang-java/debian/source/ trunk/libcommons-lang-java/debian/source/format Modified: trunk/libcommons-lang-java/debian/changelog trunk/libcommons-lang-java/debian/control trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.docs trunk/libcommons-lang-java/debian/patches/OSGi_Manifest.patch trunk/libcommons-lang-java/debian/rules Log: * Team upload. * New upstream release. * Set source package format as 3.0 (quilt). * Bump Standards-Version to 3.9.2. No changes were required. * Remove unnecessary Build-Depends on quilt. * Refresh patches. * Add mh_clean call in clean target. * Remove unnecessary dependency on JRE. * Link -doc javadocs with default-jdk-doc and add a Suggests dep on that. Modified: trunk/libcommons-lang-java/debian/changelog =================================================================== --- trunk/libcommons-lang-java/debian/changelog 2011-08-01 16:53:24 UTC (rev 13898) +++ trunk/libcommons-lang-java/debian/changelog 2011-08-02 16:51:38 UTC (rev 13899) @@ -1,3 +1,17 @@ +libcommons-lang-java (2.6-1) UNRELEASED; urgency=low + + * Team upload. + * New upstream release. + * Set source package format as 3.0 (quilt). + * Bump Standards-Version to 3.9.2. No changes were required. + * Remove unnecessary Build-Depends on quilt. + * Refresh patches. + * Add mh_clean call in clean target. + * Remove unnecessary dependency on JRE. + * Link -doc javadocs with default-jdk-doc and add a Suggests dep on that. + + -- Miguel Landaeta <mig...@miguel.cc> Tue, 02 Aug 2011 12:23:57 -0430 + libcommons-lang-java (2.4-4) unstable; urgency=low * Upload to unstable. Modified: trunk/libcommons-lang-java/debian/control =================================================================== --- trunk/libcommons-lang-java/debian/control 2011-08-01 16:53:24 UTC (rev 13898) +++ trunk/libcommons-lang-java/debian/control 2011-08-02 16:51:38 UTC (rev 13899) @@ -3,16 +3,16 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>, Kumar Appaiah <aku...@debian.org> -Build-Depends: debhelper (>= 6), cdbs, quilt, default-jdk -Build-Depends-Indep: maven-repo-helper, ant, junit (>= 3.8.1) -Standards-Version: 3.8.1 +Build-Depends: debhelper (>= 6), cdbs, default-jdk +Build-Depends-Indep: maven-repo-helper, ant, junit (>= 3.8.1), default-jdk-doc +Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-lang-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-lang-java Homepage: http://commons.apache.org/lang/ Package: libcommons-lang-java Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless +Depends: ${misc:Depends} Description: Extension of the java.lang package The Lang Component contains a set of Java classes that provide helper methods for standard Java classes, especially those found in the @@ -37,6 +37,7 @@ Section: doc Architecture: all Depends: ${misc:Depends} +Suggests: default-jdk-doc Description: Extension of the java.lang package The Lang Component contains a set of Java classes that provide helper methods for standard Java classes, especially those found in the Modified: trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.docs =================================================================== --- trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.docs 2011-08-01 16:53:24 UTC (rev 13898) +++ trunk/libcommons-lang-java/debian/libcommons-lang-java-doc.docs 2011-08-02 16:51:38 UTC (rev 13899) @@ -1 +1 @@ -dist/docs/api +build/api Modified: trunk/libcommons-lang-java/debian/patches/OSGi_Manifest.patch =================================================================== --- trunk/libcommons-lang-java/debian/patches/OSGi_Manifest.patch 2011-08-01 16:53:24 UTC (rev 13898) +++ trunk/libcommons-lang-java/debian/patches/OSGi_Manifest.patch 2011-08-02 16:51:38 UTC (rev 13899) @@ -1,9 +1,62 @@ ---- 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@ +Description: Add OSGi metadata +Author: Ludovic Claude <ludovic.cla...@laposte.net> +Forwarded: no +Last-Update: 2011-08-02 + +--- libcommons-lang-java-2.6.orig/build.xml ++++ libcommons-lang-java-2.6/build.xml +@@ -30,7 +30,7 @@ + <property file="${basedir}/build.properties"/> + <property file="${basedir}/default.properties"/> + <!-- The Sun Javadoc for versions prior to 1.3 are off-line. --> +- <property name="jdk.javadoc" value="http://java.sun.com/j2se/1.3/docs/api/"/> ++ <property name="jdk.javadoc" value="file:///usr/share/doc/default-jdk-doc/api/"/> + + <!-- ========== Construct compile classpath =============================== --> + <path id="compile.classpath"> +@@ -52,6 +52,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}"/> + <mkdir dir="${build.home}"/> + <available property="jdk.1.5.present" classname="java.lang.StringBuilder"/> + </target> +@@ -159,18 +160,7 @@ + <mkdir dir="${build.home}/classes/META-INF"/> + <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/> + <copy file="NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/> +- <jar jarfile="${build.home}/${final.name}.jar"> +- <manifest> +- <attribute name="Specification-Title" value="Commons Lang"/> +- <attribute name="Specification-Version" value="${component.version}"/> +- <attribute name="Specification-Vendor" value="The Apache Software Foundation"/> +- <attribute name="Implementation-Title" value="Commons Lang"/> +- <attribute name="Implementation-Version" value="${component.version}"/> +- <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/> +- <attribute name="Implementation-Vendor-Id" value="org.apache"/> +- <attribute name="X-Compile-Source-JDK" value="${compile.source}"/> +- <attribute name="X-Compile-Target-JDK" value="${compile.target}"/> +- </manifest> ++ <jar jarfile="${build.home}/${final.name}.jar" manifest="${build.home}/../src/conf/MANIFEST.MF"> + <fileset dir="${build.home}/classes"> + <include name="**/*.class"/> + <include name="**/LICENSE.txt"/> +--- /dev/null ++++ libcommons-lang-java-2.6/src/conf/MANIFEST.MF +@@ -0,0 +1,42 @@ ++Manifest-Version: 1.0 ++Package: org.apache.commons.lang ++Extension-Name: commons-lang ++Specification-Version: @component.version@ ++Specification-Vendor: The Apache Software Foundation ++Specification-Title: Commons Lang ++Implementation-Version: @component.version@ ++Implementation-Vendor: The Apache Software Foundation ++Implementation-Title: Commons Lang ++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@", @@ -34,13 +87,3 @@ +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}"/> Modified: trunk/libcommons-lang-java/debian/rules =================================================================== --- trunk/libcommons-lang-java/debian/rules 2011-08-01 16:53:24 UTC (rev 13898) +++ trunk/libcommons-lang-java/debian/rules 2011-08-02 16:51:38 UTC (rev 13899) @@ -2,7 +2,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) @@ -12,14 +11,18 @@ LAST_MODIFIED := $(shell date +%s%N | cut -c -13) DEB_ANT_ARGS := -Dlastmodified=$(LAST_MODIFIED) +common-post-build-indep:: + mv build/apidocs build/api + install/libcommons-lang-java:: mh_installpoms -p$(PACKAGE) - mh_installjar -p$(PACKAGE) -l pom.xml dist/commons-lang-$(VERSION).jar + mh_installjar -p$(PACKAGE) -l pom.xml build/commons-lang-$(VERSION).jar clean:: -rm gjdoc_rawcomment.cache -rm -rf docs/api/* -rm -rf debian/tmp + mh_clean get-orig-source: -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename Added: trunk/libcommons-lang-java/debian/source/format =================================================================== --- trunk/libcommons-lang-java/debian/source/format (rev 0) +++ trunk/libcommons-lang-java/debian/source/format 2011-08-02 16:51:38 UTC (rev 13899) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits