Author: ebourg-guest
Date: 2013-04-04 12:40:08 +0000 (Thu, 04 Apr 2013)
New Revision: 16488
Removed:
trunk/libcommons-logging-java/debian/libcommons-logging-java-doc.docs
Modified:
trunk/libcommons-logging-java/debian/changelog
trunk/libcommons-logging-java/debian/control
trunk/libcommons-logging-java/debian/copyright
trunk/libcommons-logging-java/debian/patches/01_target13_BuildXml.patch
trunk/libcommons-logging-java/debian/patches/02_build_javadoc.patch
trunk/libcommons-logging-java/debian/patches/03_disable_securityallow_test.patch
trunk/libcommons-logging-java/debian/patches/04_fix_jarname.patch
trunk/libcommons-logging-java/debian/patches/05_OSGi_metadata.patch
trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch
trunk/libcommons-logging-java/debian/watch
Log:
New upstream release (1.1.2)
Modified: trunk/libcommons-logging-java/debian/changelog
===================================================================
--- trunk/libcommons-logging-java/debian/changelog 2013-04-04 10:51:30 UTC
(rev 16487)
+++ trunk/libcommons-logging-java/debian/changelog 2013-04-04 12:40:08 UTC
(rev 16488)
@@ -1,3 +1,14 @@
+libcommons-logging-java (1.1.2-1) experimental; urgency=low
+
+ * Team upload.
+ * New upstream release.
+ * Updated Standards-Version to 3.9.4: no changes needed.
+ * Refreshed the patches
+ * Fixed the outdated OSGi metadata
+ * debian/copyright: converted to DEP5 format, updated the contributors
+
+ -- Emmanuel Bourg <ebo...@apache.org> Thu, 04 Apr 2013 13:27:23 +0200
+
libcommons-logging-java (1.1.1-9) unstable; urgency=low
* Team upload.
Modified: trunk/libcommons-logging-java/debian/control
===================================================================
--- trunk/libcommons-logging-java/debian/control 2013-04-04 10:51:30 UTC
(rev 16487)
+++ trunk/libcommons-logging-java/debian/control 2013-04-04 12:40:08 UTC
(rev 16488)
@@ -2,7 +2,8 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.org>
-Uploaders: Varun Hiremath <va...@debian.org>, Niels Thykier <ni...@thykier.net>
+Uploaders: Varun Hiremath <va...@debian.org>, Niels Thykier
<ni...@thykier.net>,
+ Emmanuel Bourg <ebo...@apache.org>
Build-Depends: ant-optional, cdbs, debhelper (>= 7), default-jdk
Build-Depends-Indep: junit,
libavalon-framework-java,
@@ -11,7 +12,7 @@
liblog4j1.2-java,
libservlet2.5-java,
maven-repo-helper
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-logging-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-logging-java
Homepage: http://commons.apache.org/logging
Modified: trunk/libcommons-logging-java/debian/copyright
===================================================================
--- trunk/libcommons-logging-java/debian/copyright 2013-04-04 10:51:30 UTC
(rev 16487)
+++ trunk/libcommons-logging-java/debian/copyright 2013-04-04 12:40:08 UTC
(rev 16488)
@@ -1,32 +1,38 @@
-This package was debianized by Takashi Okamoto <t...@debian.org> on
-Mon, 5 Nov 2001 08:15:04 +0900.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Commons Logging
+Upstream-Contact: Apache Commons Developers <d...@commons.apache.org>
+Source: http://commons.apache.org/logging/
-It was downloaded from http://commons.apache.org/logging/
+Files: *
+Copyright: 2001-2013, The Apache Software Foundation.
+License: Apache-2.0
+Comment:
+ Upstream authors: Juozas Baliuka <bali...@apache.org>,
+ Morgan Delagrange <morg...@apache.org>,
+ Peter Donald <dona...@apache.org>,
+ Robert Burrell Donkin <rdon...@apache.org>,
+ Simon Kitching <skitch...@apache.org>,
+ Dennis Lundberg <denn...@apache.org>,
+ Costin Manolache <cos...@apache.org>,
+ Craig McClanahan <craig...@apache.org>,
+ Thomas Neidhart <t...@apache.org>,
+ Scott Sanders <sand...@apache.org>,
+ Richard Sitze <rsi...@apache.org>,
+ Brian Stansberry,
+ Rodney Waldhoff <rwaldh...@apache.org>,
+ Matthew P. Del Buono,
+ Vince Eagen <vince...@comcast.net>,
+ Peter Lawrey,
+ Berin Loritsch <blorit...@apache.org>,
+ Philippe Mouawad,
+ Neeme Praks <ne...@apache.org>
-Upstream Authors: Morgan Delagrange <morg...@apache.org>,
- Rodney Waldhoff <rwaldhoff at apache org>,
- Craig McClanahan <craigmcc at apache org>,
- Scott Sanders <sand...@apache.org>,
- Robert Burrell Donkin <rdon...@apache.org>,
- Peter Donald <dona...@apache.org>,
- Costin Manolache <cos...@apache.org>,
- Richard Sitze <rsi...@apache.org>,
- Juozas Baliuka <bali...@apache.org>,
- Simon Kitching <skitch...@apache.org>,
- Dennis Lundberg <denn...@apache.org>,
- Brian Stansberry
+Files: debian/*
+License: Apache-2.0
+Copyright: 2001-2004, Takashi Okamoto <t...@debian.org>
+ 2005-2007, Arnaud Vandyck <av...@debian.org>, Wolfgang Baer
<wb...@gmx.de>
+ 2007, Michael Koch, <konque...@gmx.de>, Varun Hiremath
<va...@debian.org>, Kumar Appaiah <aku...@debian.org>
-Copyright: 2001-2008 The Apache Software Foundation
-
-License: Apache 2.0
-
-On Debian systems the full text of the Apache License can be found
-in `/usr/share/common-licenses/Apache-2.0'.
-
-Debian packaging: Copyright 2001 - 2004, Takashi Okamoto <t...@debian.org>
- Copyright 2005 - 2007, Arnaud Vandyck
<av...@debian.org>, Wolfgang Baer <wb...@gmx.de>
- Copyright 2007, Michael Koch, <konque...@gmx.de>, Varun
Hiremath <va...@debian.org>,
- Kumar Appaiah <aku...@debian.org>
-
-The Debian packaging of this package is licensed under the Apache
-Software License 2.0 (see above).
+License: Apache-2.0
+ On Debian systems, the full text of the Apache License can be found
+ in the file `/usr/share/common-licenses/Apache-2.0'.
Deleted: trunk/libcommons-logging-java/debian/libcommons-logging-java-doc.docs
===================================================================
--- trunk/libcommons-logging-java/debian/libcommons-logging-java-doc.docs
2013-04-04 10:51:30 UTC (rev 16487)
+++ trunk/libcommons-logging-java/debian/libcommons-logging-java-doc.docs
2013-04-04 12:40:08 UTC (rev 16488)
@@ -1,2 +0,0 @@
-STATUS.html
-
Modified:
trunk/libcommons-logging-java/debian/patches/01_target13_BuildXml.patch
===================================================================
--- trunk/libcommons-logging-java/debian/patches/01_target13_BuildXml.patch
2013-04-04 10:51:30 UTC (rev 16487)
+++ trunk/libcommons-logging-java/debian/patches/01_target13_BuildXml.patch
2013-04-04 12:40:08 UTC (rev 16488)
@@ -1,19 +1,17 @@
Description: Bumbs the source and target version options for the java compiler.
-
-diff -Nur libcommons-logging-java-1.1.1/build.xml
libcommons-logging-java-1.1.1.new/build.xml
---- libcommons-logging-java-1.1.1/build.xml 2007-11-22 04:57:52.000000000
+0530
-+++ libcommons-logging-java-1.1.1.new/build.xml 2007-12-10
09:10:40.000000000 +0530
-@@ -127,10 +127,10 @@
- <!-- ========== Compiler Defaults =========================================
-->
-
- <!-- Version of java class files to generate. -->
-- <property name="target.version" value="1.1"/>
-+ <property name="target.version" value="1.3"/>
-
- <!-- Version of java source to accept -->
-- <property name="source.version" value="1.2"/>
-+ <property name="source.version" value="1.3"/>
-
- <!-- Should Java compilations set the 'debug' compiler option? -->
- <property name="compile.debug" value="true"/>
-
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -130,10 +130,10 @@
+ <!-- ========== Compiler Defaults =========================================
-->
+
+ <!-- Version of java class files to generate. -->
+- <property name="target.version" value="1.1"/>
++ <property name="target.version" value="1.3"/>
+
+ <!-- Version of java source to accept -->
+- <property name="source.version" value="1.2"/>
++ <property name="source.version" value="1.3"/>
+
+ <!-- Should Java compilations set the 'debug' compiler option? -->
+ <property name="compile.debug" value="true"/>
Modified: trunk/libcommons-logging-java/debian/patches/02_build_javadoc.patch
===================================================================
--- trunk/libcommons-logging-java/debian/patches/02_build_javadoc.patch
2013-04-04 10:51:30 UTC (rev 16487)
+++ trunk/libcommons-logging-java/debian/patches/02_build_javadoc.patch
2013-04-04 12:40:08 UTC (rev 16488)
@@ -1,54 +1,53 @@
Description: Adds a target to generate the javadoc.
-
-diff -Nur libcommons-logging-java-1.1.1/build.xml
libcommons-logging-java-1.1.1.new/build.xml
---- libcommons-logging-java-1.1.1/build.xml 2007-12-10 08:55:12.000000000
+0530
-+++ libcommons-logging-java-1.1.1.new/build.xml 2007-12-10
08:55:55.000000000 +0530
-@@ -625,7 +625,7 @@
- </target>
-
-
-- <target name="all" depends="clean,compile,test"
-+ <target name="all" depends="clean,compile,test,javadoc"
- description="Clean and compile all components"/>
-
-
-@@ -784,5 +784,39 @@
- One or more unit tests failed.
- </fail>
- </target>
-+ <target name="javadoc" depends="compile"
-+ description="Create component Javadoc documentation">
-+ <mkdir dir="${dist.home}"/>
-+ <mkdir dir="${dist.home}/docs"/>
-+ <mkdir dir="${dist.home}/docs/api"/>
-+ <javadoc sourcepath="${source.home}"
-+ destdir="${dist.home}/docs/api"
-+ overview="${source.home}/overview.html"
-+ packagenames="org.apache.commons.*"
-+ author="true"
-+ private="true"
-+ version="true"
-+ doctitle="<h1>${component.title} (Version
-+ ${component.version})</h1>"
-+ windowtitle="${component.title} (Version
-+ ${component.version})"
-+ bottom='Copyright 2002-2004 The Apache Software
-+ Foundation.<!--
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+ http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+implied.
-+See the License for the specific language governing permissions and
-+limitations under the License.-->'>
-+ <classpath refid="test.classpath"/>
-+ </javadoc>
-+ </target>
-
- </project>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -628,7 +628,7 @@
+ </target>
+
+
+- <target name="all" depends="clean,compile,test"
++ <target name="all" depends="clean,compile,test,javadoc"
+ description="Clean and compile all components"/>
+
+
+@@ -788,4 +788,39 @@
+ </fail>
+ </target>
+
++ <target name="javadoc" depends="compile"
++ description="Create component Javadoc documentation">
++ <mkdir dir="${dist.home}"/>
++ <mkdir dir="${dist.home}/docs"/>
++ <mkdir dir="${dist.home}/docs/api"/>
++ <javadoc sourcepath="${source.home}"
++ destdir="${dist.home}/docs/api"
++ overview="${source.home}/overview.html"
++ packagenames="org.apache.commons.*"
++ author="true"
++ private="true"
++ version="true"
++ doctitle="<h1>${component.title} (Version
++ ${component.version})</h1>"
++ windowtitle="${component.title} (Version
++ ${component.version})"
++ bottom='Copyright 2002-2013 The Apache Software
++ Foundation.<!--
++
++Licensed under the Apache License, Version 2.0 (the "License");
++you may not use this file except in compliance with the License.
++You may obtain a copy of the License at
++
++ http://www.apache.org/licenses/LICENSE-2.0
++
++Unless required by applicable law or agreed to in writing, software
++distributed under the License is distributed on an "AS IS" BASIS,
++WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
++implied.
++See the License for the specific language governing permissions and
++limitations under the License.-->'>
++ <classpath refid="test.classpath"/>
++ </javadoc>
++ </target>
++
+ </project>
Modified:
trunk/libcommons-logging-java/debian/patches/03_disable_securityallow_test.patch
===================================================================
---
trunk/libcommons-logging-java/debian/patches/03_disable_securityallow_test.patch
2013-04-04 10:51:30 UTC (rev 16487)
+++
trunk/libcommons-logging-java/debian/patches/03_disable_securityallow_test.patch
2013-04-04 12:40:08 UTC (rev 16488)
@@ -1,27 +1,23 @@
-This patch has been added to disable the SecurityAllowedTestCase
-altogether, as it fails to complete successfully on GCJ. The issue
-seems to be with GCJ, so till the time that GCJ is fixed, we don't run
-this test.
-
-Kumar Appaiah <aku...@ee.iitm.ac.in>
-
-diff -Nur
libcommons-logging-java-1.1.1/src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java
libcommons-logging-java-1.1.1.new/src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java
----
libcommons-logging-java-1.1.1/src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java
2007-11-22 04:57:51.000000000 +0530
-+++
libcommons-logging-java-1.1.1.new/src/test/org/apache/commons/logging/security/SecurityAllowedTestCase.java
2007-12-29 18:30:21.000000000 +0530
-@@ -89,7 +89,7 @@
- mySecurityManager.addPermission(new AllPermission());
- System.setSecurityManager(mySecurityManager);
-
-- try {
-+ /* try {
- // Use reflection so that we can control exactly when the static
- // initialiser for the LogFactory class is executed.
- Class c = this.getClass().getClassLoader().loadClass(
-@@ -130,6 +130,6 @@
- PrintWriter pw = new PrintWriter(sw);
- t.printStackTrace(pw);
- fail("Unexpected exception:" + t.getMessage() + ":" +
sw.toString());
-- }
-+ }*/
- }
- }
+Description: This patch has been added to disable the SecurityAllowedTestCase
+ altogether, as it fails to complete successfully on GCJ. The issue
+ seems to be with GCJ, so till the time that GCJ is fixed, we don't run
+ this test.
+Author: Kumar Appaiah <aku...@ee.iitm.ac.in>
+Forwarded: not-needed
+---
a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
++++
b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
+@@ -92,6 +92,7 @@
+ mySecurityManager.addPermission(new AllPermission());
+ System.setSecurityManager(mySecurityManager);
+
++ /*
+ try {
+ // Use reflection so that we can control exactly when the static
+ // initialiser for the LogFactory class is executed.
+@@ -136,5 +137,6 @@
+ t.printStackTrace(pw);
+ fail("Unexpected exception:" + t.getMessage() + ":" +
sw.toString());
+ }
++ */
+ }
+ }
Modified: trunk/libcommons-logging-java/debian/patches/04_fix_jarname.patch
===================================================================
--- trunk/libcommons-logging-java/debian/patches/04_fix_jarname.patch
2013-04-04 10:51:30 UTC (rev 16487)
+++ trunk/libcommons-logging-java/debian/patches/04_fix_jarname.patch
2013-04-04 12:40:08 UTC (rev 16488)
@@ -1,18 +1,16 @@
-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.
-
-Kumar Appaiah <aku...@ee.iitm.ac.in>
-
-diff -Nur libcommons-logging-java-1.1.1/build.xml
libcommons-logging-java-1.1.1.new/build.xml
---- libcommons-logging-java-1.1.1/build.xml 2007-12-29 18:33:28.000000000
+0530
-+++ libcommons-logging-java-1.1.1.new/build.xml 2007-12-29
18:33:36.000000000 +0530
+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 <aku...@ee.iitm.ac.in>
+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.1-SNAPSHOT"/>
-+ <property name="component.version" value="1.1.1"/>
-
- <!-- The base directory for compilation targets -->
- <property name="build.home" value="${basedir}/target"/>
+ <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"/>
Modified: trunk/libcommons-logging-java/debian/patches/05_OSGi_metadata.patch
===================================================================
--- trunk/libcommons-logging-java/debian/patches/05_OSGi_metadata.patch
2013-04-04 10:51:30 UTC (rev 16487)
+++ trunk/libcommons-logging-java/debian/patches/05_OSGi_metadata.patch
2013-04-04 12:40:08 UTC (rev 16488)
@@ -1,18 +1,24 @@
Description: Adds OSGi metadata to the jar file.
-Origin: Fedora
-
---- a/src/conf/MANIFEST.MF 2006-08-10 18:13:20.000000000 -0400
-+++ b/src/conf/MANIFEST.MF 2007-07-11 13:19:50.000000000 -0400
-@@ -6,3 +6,12 @@
- Implementation-Vendor-Id: org.apache
- Implementation-Vendor: Apache Software Foundation
- Implementation-Version: 1.1.1
-+Bundle-ManifestVersion: 2
-+Export-Package: org.apache.commons.logging;version="1.0.4",org.apache.
-+ commons.logging.impl;version="1.0.4"
-+Bundle-Version: 1.0.4.v20080605-1930
-+Bundle-SymbolicName: org.apache.commons.logging
-+Bundle-Name: Apache Commons Logging Plug-in
-+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
-+Bundle-Localization: plugin
-+Bundle-Vendor: Apache Software Foundation
+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: 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-04-04 10:51:30 UTC (rev 16487)
+++ trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch
2013-04-04 12:40:08 UTC (rev 16488)
@@ -1,9 +1,9 @@
-Index: libcommons-logging-java-1.1.1/src/conf/MANIFEST.MF
-===================================================================
---- libcommons-logging-java-1.1.1.orig/src/conf/MANIFEST.MF 2010-03-17
18:23:29.000000000 +0530
-+++ libcommons-logging-java-1.1.1/src/conf/MANIFEST.MF 2010-03-17
20:10:50.000000000 +0530
-@@ -15,3 +15,4 @@
- Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
- Bundle-Localization: plugin
- Bundle-Vendor: Apache Software Foundation
-+Class-Path: avalon-framework.jar excalibur-logkit.jar log4j-1.2.jar
servlet-api-2.5.jar
+Description: Adds the classpath entry to the manifest file
+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)"
++Class-Path: avalon-framework.jar excalibur-logkit.jar log4j-1.2.jar
servlet-api-2.5.jar
Modified: trunk/libcommons-logging-java/debian/watch
===================================================================
--- trunk/libcommons-logging-java/debian/watch 2013-04-04 10:51:30 UTC (rev
16487)
+++ trunk/libcommons-logging-java/debian/watch 2013-04-04 12:40:08 UTC (rev
16488)
@@ -1,2 +1,2 @@
version=3
-http://www.apache.org/dist/commons/logging/source/commons-logging-(.*)-src\.tar\.gz
debian uupdate
+http://archive.apache.org/dist/commons/logging/source/commons-logging-(.*)-src\.tar\.gz
debian uupdate
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
