[apache-log4j1.2] 19/40: Enabled the compilation of the org.apache.log4j.jmx.Agent class Added a description to build_fix.patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository apache-log4j1.2.

commit 8546f275d758597fcfb2b10abdefe928b3200a6d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 27 07:59:39 2013 +0000

    Enabled the compilation of the org.apache.log4j.jmx.Agent class
    Added a description to build_fix.patch
---
 debian/changelog               |  4 +++-
 debian/patches/build_fix.patch | 12 +++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 400aed8..16d3af4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ apache-log4j1.2 (1.2.17-4) unstable; urgency=low
 
   * 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
 
diff --git a/debian/patches/build_fix.patch b/debian/patches/build_fix.patch
index e0b60e1..3d67522 100644
--- a/debian/patches/build_fix.patch
+++ b/debian/patches/build_fix.patch
@@ -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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j1.2.git