[pkg-java] r4987 - in trunk/commons-logging/debian: . patches

kumanna-guest at alioth.debian.org kumanna-guest at alioth.debian.org
Mon Dec 10 03:31:13 UTC 2007 

Author: kumanna-guest
Date: 2007-12-10 03:31:13 +0000 (Mon, 10 Dec 2007)
New Revision: 4987

Modified:
   trunk/commons-logging/debian/changelog
   trunk/commons-logging/debian/control
   trunk/commons-logging/debian/copyright
   trunk/commons-logging/debian/patches/01_target13_BuildXml.patch
   trunk/commons-logging/debian/patches/02_build_javadoc.patch
   trunk/commons-logging/debian/rules
Log:
* New upstream release.
* debian/patches:
  + Refresh 01_target13_BuildXml.patch and 02_build_javadoc.patch.
* debian/control:
  + Make XS-Svn-* fields Svn-*, as dpkg supports them now.
  + Standards version is now 3.7.3.

* debian/copyright:
  + Add copyright, upstream authors.
  + Add Debian packaging copyright.


Modified: trunk/commons-logging/debian/changelog
===================================================================
--- trunk/commons-logging/debian/changelog	2007-12-09 19:58:28 UTC (rev 4986)
+++ trunk/commons-logging/debian/changelog	2007-12-10 03:31:13 UTC (rev 4987)
@@ -1,9 +1,14 @@
-libcommons-logging-java (1.1-2) UNRELEASED; urgency=low
+libcommons-logging-java (1.1.1-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * debian/patches:
+    + Refresh 01_target13_BuildXml.patch and 02_build_javadoc.patch.
+  * debian/control:
+    + Make XS-Svn-* fields Svn-*, as dpkg supports them now.
+    + Standards version is now 3.7.3.
+  
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Mon, 10 Dec 2007 08:52:17 +0530
 
- -- Varun Hiremath <varunhiremath at gmail.com>  Mon, 08 Oct 2007 18:31:10 +0530
-
 libcommons-logging-java (1.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -18,9 +23,12 @@
   * debian/patches/01_target13_BuildXml.patch: updated for new upstream release.
   * debian/patches/02_build_javadoc.patch: Added for building API docs through build.xml.
   * debian/watch: Bump to version 3.
+  * debian/copyright:
+    + Add copyright, upstream authors.
+    + Add Debian packaging copyright.
+  
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Wed, 26 Sep 2007 06:51:56 +0530
 
- -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Tue, 25 Sep 2007 17:23:33 +0530
-
 libcommons-logging-java (1.0.4-6) unstable; urgency=low
 
   * Use java-gcj-compat instead of kaffe.

Modified: trunk/commons-logging/debian/control
===================================================================
--- trunk/commons-logging/debian/control	2007-12-09 19:58:28 UTC (rev 4986)
+++ trunk/commons-logging/debian/control	2007-12-10 03:31:13 UTC (rev 4987)
@@ -4,10 +4,10 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <abdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, ant-optional, liblogkit-java, liblog4j1.2-java, libavalon-framework-java, java-gcj-compat-dev, junit, libservlet2.3-java
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-logging
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-logging
+Build-Depends-Indep: ant-optional, liblogkit-java, liblog4j1.2-java, libavalon-framework-java, java-gcj-compat-dev, junit, libservlet2.3-java
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-logging
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-logging
 Homepage: http://commons.apache.org/logging
 
 Package: libcommons-logging-java

Modified: trunk/commons-logging/debian/copyright
===================================================================
--- trunk/commons-logging/debian/copyright	2007-12-09 19:58:28 UTC (rev 4986)
+++ trunk/commons-logging/debian/copyright	2007-12-10 03:31:13 UTC (rev 4987)
@@ -3,9 +3,26 @@
 
 It was downloaded from http://jakarta.apache.org/commons/
 
+Authors: The Apache Commons Logging Developers
 
-Copyright:
+Various parts of the source code written by:
+	 Brian Stansberry
+	 Costin Manolache
+	 Craig R. McClanahan
+	 Richard A. Sitze
+	 Robert Burrell Donkin
+	 Rod Waldhoff
+	 Sean C. Sullivan
+	 Berin Loritsch <bloritsch at apache.org>
+	 Peter Donald <donaldp at apache.org>
+	 Neeme Praks <neeme at apache.org>
+	 Scott Sanders <sanders at apache.org>
+	 Vince Eagen <vince256 at comcast.net>
 
+Copyright: 2001 - 2006, The Apache Software Foundation.
+
+License:
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -207,3 +224,11 @@
    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.
+
+Debian packaging: (C) 2001 - 2004, Takashi Okamoto <tora at debian.org>
+       		  (C) 2005 - 2007, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+		  (C) 2007, Michael Koch, <konqueror at gmx.de>, Varun Hiremath <varunhiremath at gmail.com>,
+		  Kumar Appaiah <akumar at ee.iitm.ac.in>
+
+The Debian packaging of this package is licensed under the Apache
+Software License 2.0 (see above).

Modified: trunk/commons-logging/debian/patches/01_target13_BuildXml.patch
===================================================================
--- trunk/commons-logging/debian/patches/01_target13_BuildXml.patch	2007-12-09 19:58:28 UTC (rev 4986)
+++ trunk/commons-logging/debian/patches/01_target13_BuildXml.patch	2007-12-10 03:31:13 UTC (rev 4987)
@@ -1,7 +1,7 @@
-diff -Nur libcommons-logging-java-1.1/build.xml libcommons-logging-java-1.1.new/build.xml
---- libcommons-logging-java-1.1/build.xml	2006-05-10 03:15:08.000000000 +0530
-+++ libcommons-logging-java-1.1.new/build.xml	2007-09-22 01:08:23.000000000 +0530
-@@ -125,10 +125,10 @@
+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 08:55:01.000000000 +0530
+@@ -127,10 +127,10 @@
  <!-- ========== Compiler Defaults ========================================= -->
  
    <!-- Version of java class files to generate. -->

Modified: trunk/commons-logging/debian/patches/02_build_javadoc.patch
===================================================================
--- trunk/commons-logging/debian/patches/02_build_javadoc.patch	2007-12-09 19:58:28 UTC (rev 4986)
+++ trunk/commons-logging/debian/patches/02_build_javadoc.patch	2007-12-10 03:31:13 UTC (rev 4987)
@@ -1,52 +1,52 @@
-diff -Nur libcommons-logging-java-1.1/build.xml libcommons-logging-java-1.1.new/build.xml
---- libcommons-logging-java-1.1/build.xml	2006-05-10 03:15:08.000000000 +0530
-+++ libcommons-logging-java-1.1.new/build.xml	2007-09-25 17:11:20.000000000 +0530
-@@ -613,7 +613,7 @@
-   </target>
- 
- 
--  <target name="all" depends="clean,compile,test"
-+  <target name="all" depends="clean,compile,test,javadoc"
-    description="Clean and compile all components"/>
- 
- 
-@@ -772,5 +772,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="&lt;h1&gt;${component.title} (Version
-+		       ${component.version})&lt;/h1&gt;"
-+             windowtitle="${component.title} (Version
-+			  ${component.version})"
-+             bottom='Copyright 2002-2004 The Apache Software
-+		     Foundation.&lt;!--
-+
-+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.--&gt;'>
-+      <classpath refid="test.classpath"/>
-+    </javadoc>
-+  </target>
- 
- </project>
+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="&lt;h1&gt;${component.title} (Version
++		       ${component.version})&lt;/h1&gt;"
++             windowtitle="${component.title} (Version
++			  ${component.version})"
++             bottom='Copyright 2002-2004 The Apache Software
++		     Foundation.&lt;!--
++
++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.--&gt;'>
++      <classpath refid="test.classpath"/>
++    </javadoc>
++  </target>
+ 
+ </project>

Modified: trunk/commons-logging/debian/rules
===================================================================
--- trunk/commons-logging/debian/rules	2007-12-09 19:58:28 UTC (rev 4986)
+++ trunk/commons-logging/debian/rules	2007-12-10 03:31:13 UTC (rev 4987)
@@ -8,7 +8,7 @@
 JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 
-DEB_JARS := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit servlet-2.3.jar
+DEB_JARS := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit
 
 DEB_ANT_BUILD_TARGET := dist

More information about the pkg-java-commits mailing list