Author: ebourg-guest Date: 2013-05-21 20:23:42 +0000 (Tue, 21 May 2013) New Revision: 16716
Removed: trunk/libcommons-logging-java/debian/patches/04_fix_jarname.patch trunk/libcommons-logging-java/debian/patches/05_OSGi_metadata.patch Modified: trunk/libcommons-logging-java/debian/changelog trunk/libcommons-logging-java/debian/patches/02_build_javadoc.patch trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch trunk/libcommons-logging-java/debian/patches/series Log: New upstream release (1.1.3) Refreshed the patches Modified: trunk/libcommons-logging-java/debian/changelog =================================================================== --- trunk/libcommons-logging-java/debian/changelog 2013-05-21 18:46:06 UTC (rev 16715) +++ trunk/libcommons-logging-java/debian/changelog 2013-05-21 20:23:42 UTC (rev 16716) @@ -1,3 +1,10 @@ +libcommons-logging-java (1.1.3-1) experimental; urgency=low + + * New upstream release. + * Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Tue, 21 May 2013 22:18:11 +0200 + libcommons-logging-java (1.1.2-2) experimental; urgency=low * Fix Bundle-SymbolicName commons-logging -> org.apache.commons.logging Modified: trunk/libcommons-logging-java/debian/patches/02_build_javadoc.patch =================================================================== --- trunk/libcommons-logging-java/debian/patches/02_build_javadoc.patch 2013-05-21 18:46:06 UTC (rev 16715) +++ trunk/libcommons-logging-java/debian/patches/02_build_javadoc.patch 2013-05-21 20:23:42 UTC (rev 16716) @@ -2,7 +2,7 @@ Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -628,7 +628,7 @@ +@@ -613,7 +613,7 @@ </target> @@ -11,7 +11,7 @@ description="Clean and compile all components"/> -@@ -788,4 +788,39 @@ +@@ -773,4 +773,39 @@ </fail> </target> Deleted: trunk/libcommons-logging-java/debian/patches/04_fix_jarname.patch =================================================================== --- trunk/libcommons-logging-java/debian/patches/04_fix_jarname.patch 2013-05-21 18:46:06 UTC (rev 16715) +++ trunk/libcommons-logging-java/debian/patches/04_fix_jarname.patch 2013-05-21 20:23:42 UTC (rev 16716) @@ -1,16 +0,0 @@ -Description: Upstream has named the JARs as commons-logging-<name>-SNAPSHOT.jar - this time. We don't really want the snapshot, as the JAR should be the - same as the upstream version. -Author: Kumar Appaiah <[email protected]> -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -94,7 +94,7 @@ - <property name="component.title" value="Logging Wrapper Library"/> - - <!-- The current version number of this component --> -- <property name="component.version" value="1.1.2-SNAPSHOT"/> -+ <property name="component.version" value="1.1.2"/> - - <!-- The base directory for compilation targets --> - <property name="build.home" value="${basedir}/target"/> Deleted: trunk/libcommons-logging-java/debian/patches/05_OSGi_metadata.patch =================================================================== --- trunk/libcommons-logging-java/debian/patches/05_OSGi_metadata.patch 2013-05-21 18:46:06 UTC (rev 16715) +++ trunk/libcommons-logging-java/debian/patches/05_OSGi_metadata.patch 2013-05-21 20:23:42 UTC (rev 16716) @@ -1,24 +0,0 @@ -Description: Adds OSGi metadata to the jar file. -Origin: vendor -Forwarded: not-needed ---- a/src/conf/MANIFEST.MF -+++ b/src/conf/MANIFEST.MF -@@ -6,3 +6,18 @@ - Implementation-Vendor-Id: org.apache - Implementation-Vendor: Apache Software Foundation - Implementation-Version: 1.1.2 -+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -+Bundle-SymbolicName: org.apache.commons.logging -+Bundle-Name: Commons Logging -+Bundle-Vendor: The Apache Software Foundation -+Bundle-Version: 1.1.2 -+Bundle-ManifestVersion: 2 -+Bundle-Description: Commons Logging is a thin adapter allowing configu -+ rable bridging to other, well known logging systems. -+Bundle-DocURL: http://commons.apache.org/logging/ -+Export-Package: org.apache.commons.logging;version="1.1.2",org.apache. -+ commons.logging.impl;version="1.1.2" -+Import-Package: javax.servlet;resolution:=optional;version="[2.1.0,3.0 -+ .0)",org.apache.avalon.framework.logger;resolution:=optional;version= -+ "[4.1.3,4.1.5]",org.apache.log;resolution:=optional;version="[1.0.1,1 -+ .0.1]",org.apache.log4j;resolution:=optional;version="[1.2.15,2.0.0)" Modified: trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch =================================================================== --- trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch 2013-05-21 18:46:06 UTC (rev 16715) +++ trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch 2013-05-21 20:23:42 UTC (rev 16716) @@ -2,8 +2,8 @@ Forwarded: not-needed --- a/src/conf/MANIFEST.MF +++ b/src/conf/MANIFEST.MF -@@ -21,3 +21,4 @@ - .0)",org.apache.avalon.framework.logger;resolution:=optional;version= - "[4.1.3,4.1.5]",org.apache.log;resolution:=optional;version="[1.0.1,1 - .0.1]",org.apache.log4j;resolution:=optional;version="[1.2.15,2.0.0)" +@@ -26,3 +26,4 @@ + Include-Resource: META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt= + LICENSE.txt + Specification-Version: 1.1.3 +Class-Path: avalon-framework.jar excalibur-logkit.jar log4j-1.2.jar servlet-api-3.0.jar Modified: trunk/libcommons-logging-java/debian/patches/series =================================================================== --- trunk/libcommons-logging-java/debian/patches/series 2013-05-21 18:46:06 UTC (rev 16715) +++ trunk/libcommons-logging-java/debian/patches/series 2013-05-21 20:23:42 UTC (rev 16716) @@ -1,6 +1,4 @@ 01_target13_BuildXml.patch 02_build_javadoc.patch 03_disable_securityallow_test.patch -04_fix_jarname.patch -05_OSGi_metadata.patch 06_classpath_manifest.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
