This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-logging-java.
commit fdcc058a62692e7fcf55a6db866fb8340ae51610 Author: Onkar Shinde <[email protected]> Date: Wed Mar 17 14:45:24 2010 +0000 misc fixes --- debian/ant.properties | 2 +- debian/changelog | 13 +++++++++++++ debian/control | 6 +++--- debian/patches/06_classpath_manifest.patch | 9 +++++++++ debian/patches/series | 1 + debian/rules | 2 +- 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index 03cc8e0..95684ed 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -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 diff --git a/debian/changelog b/debian/changelog index 1f43288..e08ac3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Wed, 17 Mar 2010 16:08:31 +0530 + libcommons-logging-java (1.1.1-6) unstable; urgency=low * Added myself to uploaders. diff --git a/debian/control b/debian/control index 83f82ea..eff9ea2 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, Kumar Appaiah <[email protected]>, Varun Hiremath <[email protected]>, Niels Thykier <[email protected]> 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 @@ Homepage: http://commons.apache.org/logging 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 diff --git a/debian/patches/06_classpath_manifest.patch b/debian/patches/06_classpath_manifest.patch new file mode 100644 index 0000000..18a7c38 --- /dev/null +++ b/debian/patches/06_classpath_manifest.patch @@ -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 diff --git a/debian/patches/series b/debian/patches/series index 016dcae..d4138ec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 03_disable_securityallow_test.patch 04_fix_jarname.patch 05_OSGi_metadata.patch +06_classpath_manifest.patch diff --git a/debian/rules b/debian/rules index 45960a2..291b7f4 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-logging-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
