[pkg-java] r11889 - in trunk/libcommons-logging-java/debian: . patches

[Onkar Shinde]

Author: onkarshinde-guest
Date: 2010-03-17 14:45:24 +0000 (Wed, 17 Mar 2010)
New Revision: 11889

Added:
   trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch
Modified:
   trunk/libcommons-logging-java/debian/ant.properties
   trunk/libcommons-logging-java/debian/changelog
   trunk/libcommons-logging-java/debian/control
   trunk/libcommons-logging-java/debian/patches/series
   trunk/libcommons-logging-java/debian/rules
Log:
misc fixes

Modified: trunk/libcommons-logging-java/debian/ant.properties
===================================================================
--- trunk/libcommons-logging-java/debian/ant.properties	2010-03-17 07:29:24 UTC (rev 11888)
+++ trunk/libcommons-logging-java/debian/ant.properties	2010-03-17 14:45:24 UTC (rev 11889)
@@ -1,6 +1,6 @@
 log4j.jar=/usr/share/java/log4j-1.2.jar
 log4j12.jar=/usr/share/java/log4j-1.2.jar
-logkit.jar=/usr/share/java/logkit.jar
+logkit.jar=/usr/share/java/excalibur-logkit.jar
 avalon-framework.jar=/usr/share/java/avalon-framework.jar
 junit.jar=/usr/share/java/junit.jar
 servletapi.jar=/usr/share/java/servlet-api-2.5.jar

Modified: trunk/libcommons-logging-java/debian/changelog
===================================================================
--- trunk/libcommons-logging-java/debian/changelog	2010-03-17 07:29:24 UTC (rev 11888)
+++ trunk/libcommons-logging-java/debian/changelog	2010-03-17 14:45:24 UTC (rev 11889)
@@ -1,3 +1,16 @@
+libcommons-logging-java (1.1.1-7) unstable; urgency=low
+
+  [ Onkar Shinde ]
+  * Replace build/runtime dep liblogkit-java with libexcalibur-logkit-java.
+    Adjust DEB_JARS in rules file and properties in ant.properties accordingly.
+  * Add build dependency libavalon-framework-java.
+  * Update standards version to 3.8.4.
+  * debian/patches/06_classpath_manifest.patch
+    - Add a 'Class-Path' entry in MANIFEST.MF file with a list of appropriate
+      jar files.
+
+ -- Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>  Wed, 17 Mar 2010 16:08:31 +0530
+
 libcommons-logging-java (1.1.1-6) unstable; urgency=low
 
   * Added myself to uploaders.

Modified: trunk/libcommons-logging-java/debian/control
===================================================================
--- trunk/libcommons-logging-java/debian/control	2010-03-17 07:29:24 UTC (rev 11888)
+++ trunk/libcommons-logging-java/debian/control	2010-03-17 14:45:24 UTC (rev 11889)
@@ -6,8 +6,8 @@
  Kumar Appaiah <akumar at debian.org>, Varun Hiremath <varun at debian.org>,
  Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional
-Build-Depends-Indep: maven-repo-helper, liblogkit-java, liblog4j1.2-java, junit, libservlet2.5-java
-Standards-Version: 3.8.3
+Build-Depends-Indep: maven-repo-helper, libexcalibur-logkit-java, liblog4j1.2-java, junit, libservlet2.5-java, libavalon-framework-java
+Standards-Version: 3.8.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
@@ -15,7 +15,7 @@
 Package: libcommons-logging-java
 Architecture: all
 Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless
-Suggests: libservlet2.5-java, liblog4j1.2-java, liblogkit-java, libavalon-framework-java, libcommons-logging-java-doc
+Suggests: libservlet2.5-java, liblog4j1.2-java, libexcalibur-logkit-java, libavalon-framework-java, libcommons-logging-java-doc
 Description: commmon wrapper interface for several logging APIs
  Provides a simple, component oriented interface together with wrappers for 
  several existing java logging systems. The user can choose at runtime which

Added: trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch
===================================================================
--- trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch	                        (rev 0)
+++ trunk/libcommons-logging-java/debian/patches/06_classpath_manifest.patch	2010-03-17 14:45:24 UTC (rev 11889)
@@ -0,0 +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

Modified: trunk/libcommons-logging-java/debian/patches/series
===================================================================
--- trunk/libcommons-logging-java/debian/patches/series	2010-03-17 07:29:24 UTC (rev 11888)
+++ trunk/libcommons-logging-java/debian/patches/series	2010-03-17 14:45:24 UTC (rev 11889)
@@ -3,3 +3,4 @@
 03_disable_securityallow_test.patch
 04_fix_jarname.patch
 05_OSGi_metadata.patch
+06_classpath_manifest.patch

Modified: trunk/libcommons-logging-java/debian/rules
===================================================================
--- trunk/libcommons-logging-java/debian/rules	2010-03-17 07:29:24 UTC (rev 11888)
+++ trunk/libcommons-logging-java/debian/rules	2010-03-17 14:45:24 UTC (rev 11889)
@@ -7,7 +7,7 @@
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME		     := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := dist
-DEB_JARS		     := commons-logging log4j-1.2 logkit avalon-framework servlet-api-2.5 junit ant-junit
+DEB_JARS		     := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-2.5 junit ant-junit
 
 makebuilddir/lib$(PACKAGE)-java::
 	# copy MANIFEST.MF to src/main/resources/META-INF/ to include it in the jar