Author: thkoch-guest Date: 2010-01-12 11:06:28 +0000 (Tue, 12 Jan 2010) New Revision: 11347
Modified: trunk/jakarta-log4j/debian/changelog trunk/jakarta-log4j/debian/control trunk/jakarta-log4j/debian/patches/01_build_fix.patch Log: new debian version to enable jmx support Modified: trunk/jakarta-log4j/debian/changelog =================================================================== --- trunk/jakarta-log4j/debian/changelog 2010-01-10 17:36:41 UTC (rev 11346) +++ trunk/jakarta-log4j/debian/changelog 2010-01-12 11:06:28 UTC (rev 11347) @@ -1,3 +1,9 @@ +jakarta-log4j (1.2.15-8) unstable; urgency=low + + * Build with jmx support + + -- Thomas Koch <[email protected]> Tue, 12 Jan 2010 11:02:21 +0100 + jakarta-log4j (1.2.15-7) unstable; urgency=low * Upload to unstable Modified: trunk/jakarta-log4j/debian/control =================================================================== --- trunk/jakarta-log4j/debian/control 2010-01-10 17:36:41 UTC (rev 11346) +++ trunk/jakarta-log4j/debian/control 2010-01-12 11:06:28 UTC (rev 11347) @@ -2,9 +2,10 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Kalle Kivimaa <[email protected]>, Michael Koch <[email protected]>, Varun Hiremath <[email protected]>, Kumar Appaiah <[email protected]>, Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant, libgnujaf-java, libgnumail-java, maven-repo-helper, openjdk-6-doc -Standards-Version: 3.8.2 +Uploaders: Kalle Kivimaa <[email protected]>, Michael Koch <[email protected]>, Varun Hiremath <[email protected]>, Kumar Appaiah <[email protected]>, Torsten Werner <[email protected]>, Thomas Koch <[email protected]> +Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant, libgnujaf-java, + libgnumail-java, maven-repo-helper, openjdk-6-doc, libjboss-jmx-java +Standards-Version: 3.8.3 Homepage: http://jakarta.apache.org/log4j Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jakarta-log4j Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jakarta-log4j Modified: trunk/jakarta-log4j/debian/patches/01_build_fix.patch =================================================================== --- trunk/jakarta-log4j/debian/patches/01_build_fix.patch 2010-01-10 17:36:41 UTC (rev 11346) +++ trunk/jakarta-log4j/debian/patches/01_build_fix.patch 2010-01-12 11:06:28 UTC (rev 11347) @@ -1,6 +1,5 @@ -diff -Nur jakarta-log4j-1.2.15/build.xml jakarta-log4j-1.2.15.new/build.xml ---- jakarta-log4j-1.2.15/build.xml 2007-08-25 09:39:43.000000000 +0530 -+++ jakarta-log4j-1.2.15.new/build.xml 2007-09-26 11:56:11.000000000 +0530 +--- jakarta-log4j-1.2.15/build.xml.orig 2010-01-07 20:14:49.000000000 +0100 ++++ jakarta-log4j-1.2.15/build.xml 2010-01-08 15:35:21.000000000 +0100 @@ -97,8 +97,8 @@ <!-- Directory for temporary files. --> <property name="dist.tmp" value="${dist.dir}/tmp"/> @@ -12,6 +11,31 @@ <!-- destination for generated documentation on Apache web host --> <property name="apache.javadoc_dest" value="/www/logging.apache.org/log4j/docs"/> +@@ -166,13 +166,13 @@ + <and> + <available classname="javax.management.MBeanInfo" + classpath="${jmx.jar}"/> +- <available classname="com.sun.jdmk.comm.HtmlAdaptorServer"> ++ <!--available classname="com.sun.jdmk.comm.HtmlAdaptorServer"> + <classpath> + <pathelement location="${jmx.jar}"/> + <pathelement location="${jmx-extra.jar}"/> + <pathelement location="${javaee-api.jar}"/> + </classpath> +- </available> ++ </available--> + </and> + </condition> + </target> +@@ -336,7 +336,7 @@ + <javac srcdir="${java.source.dir}" + destdir="${javac.dest}" + includes="${stem}/jmx/*.java" +- excludes="${stem}/jmx/T.java" ++ excludes="${stem}/jmx/T.java,${stem}/jmx/Agent.java" + target="${javac.target}" + source="${javac.source}" + includeAntRuntime="${javac.includeAntRuntime}" @@ -497,7 +497,6 @@ protected="true" author="true" _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
