[pkg-java] r17178 - in trunk/apache-log4j1.2/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-08-27 07:59:39 +0000 (Tue, 27 Aug 2013)
New Revision: 17178

Modified:
   trunk/apache-log4j1.2/debian/changelog
   trunk/apache-log4j1.2/debian/patches/build_fix.patch
Log:
Enabled the compilation of the org.apache.log4j.jmx.Agent class
Added a description to build_fix.patch



Modified: trunk/apache-log4j1.2/debian/changelog
===================================================================
--- trunk/apache-log4j1.2/debian/changelog	2013-08-27 07:45:37 UTC (rev 17177)
+++ trunk/apache-log4j1.2/debian/changelog	2013-08-27 07:59:39 UTC (rev 17178)
@@ -2,8 +2,10 @@
 
   * Removed the dependency on libjboss-jmx-java since javax.management
     is now part of the JDK.
+  * Enabled the compilation of the org.apache.log4j.jmx.Agent class
+  * Added a description to build_fix.patch
 
- -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Aug 2013 09:09:18 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Aug 2013 09:52:20 +0200
 
 apache-log4j1.2 (1.2.17-3) unstable; urgency=low
 

Modified: trunk/apache-log4j1.2/debian/patches/build_fix.patch
===================================================================
--- trunk/apache-log4j1.2/debian/patches/build_fix.patch	2013-08-27 07:45:37 UTC (rev 17177)
+++ trunk/apache-log4j1.2/debian/patches/build_fix.patch	2013-08-27 07:59:39 UTC (rev 17178)
@@ -1,3 +1,6 @@
+Description: Enables the compilation of the JMX classes and tweaks the Javadoc.
+Author: Thomas Koch <thomas at koch.ro>
+Forwarded: no
 --- a/build.xml
 +++ b/build.xml
 @@ -167,12 +167,12 @@
@@ -15,15 +18,6 @@
          </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"