[pkg-java] r12996 - in trunk/jakarta-log4j/debian: . patches

[Ludovic Claude]

Author: ludovicc-guest
Date: 2010-09-21 22:12:23 +0000 (Tue, 21 Sep 2010)
New Revision: 12996

Removed:
   trunk/jakarta-log4j/debian/patches/pom.xml.patch
Modified:
   trunk/jakarta-log4j/debian/changelog
   trunk/jakarta-log4j/debian/patches/build_fix.patch
   trunk/jakarta-log4j/debian/patches/series
   trunk/jakarta-log4j/debian/rules
Log:
* New release



Modified: trunk/jakarta-log4j/debian/changelog
===================================================================
--- trunk/jakarta-log4j/debian/changelog	2010-09-21 21:53:52 UTC (rev 12995)
+++ trunk/jakarta-log4j/debian/changelog	2010-09-21 22:12:23 UTC (rev 12996)
@@ -1,10 +1,12 @@
-jakarta-log4j (1.2.16-0ubuntu1~ppa1) lucid; urgency=low
+jakarta-log4j (1.2.16-1) experimental; urgency=low
 
   * New upstream release
   * debian/control:
     + Standards version is now 3.9.1 (No changes needed).
     + Recommends: liblog4j1.2-java-gcj downgraded to Suggests
       (Closes: #583260)
+  * Remove pom.xml.patch, changes applied upstream,
+    refresh build.xml.patch
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 14 May 2010 00:11:30 +0200
 

Modified: trunk/jakarta-log4j/debian/patches/build_fix.patch
===================================================================
--- trunk/jakarta-log4j/debian/patches/build_fix.patch	2010-09-21 21:53:52 UTC (rev 12995)
+++ trunk/jakarta-log4j/debian/patches/build_fix.patch	2010-09-21 22:12:23 UTC (rev 12996)
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/build.xml
++++ b/build.xml
+@@ -99,8 +99,8 @@
    <!-- Directory for temporary files. -->
    <property name="dist.tmp" value="${dist.dir}/tmp"/>
    
@@ -11,7 +11,7 @@
    
    <!--  destination for generated documentation on Apache web host  -->
    <property name="apache.javadoc_dest" value="/www/logging.apache.org/log4j/docs"/>
-@@ -166,13 +166,13 @@
+@@ -167,12 +167,12 @@
          <and>
              <available classname="javax.management.MBeanInfo"
                         classpath="${jmx.jar}"/>
@@ -19,7 +19,6 @@
 +            <!--available classname="com.sun.jdmk.comm.HtmlAdaptorServer">
                  <classpath>
                      <pathelement location="${jmx.jar}"/>
-                     <pathelement location="${jmx-extra.jar}"/>
  					<pathelement location="${javaee-api.jar}"/>
                  </classpath>
 -            </available>

Deleted: trunk/jakarta-log4j/debian/patches/pom.xml.patch
===================================================================
--- trunk/jakarta-log4j/debian/patches/pom.xml.patch	2010-09-21 21:53:52 UTC (rev 12995)
+++ trunk/jakarta-log4j/debian/patches/pom.xml.patch	2010-09-21 22:12:23 UTC (rev 12996)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pom.xml.dpatch by Gabriele Giacone <1o5g4r8o at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
---- a/pom.xml
-+++ b/pom.xml
-@@ -389,11 +389,13 @@
-     <groupId>javax.mail</groupId>
-     <artifactId>mail</artifactId>
-     <version>1.4</version>
-+    <optional>true</optional>
-   </dependency>
-   <dependency>
-     <groupId>javax.jms</groupId>
-     <artifactId>jms</artifactId>
-     <version>1.1</version>
-+    <optional>true</optional>
-   </dependency>
-  <dependency>
-     <groupId>com.sun.jdmk</groupId>

Modified: trunk/jakarta-log4j/debian/patches/series
===================================================================
--- trunk/jakarta-log4j/debian/patches/series	2010-09-21 21:53:52 UTC (rev 12995)
+++ trunk/jakarta-log4j/debian/patches/series	2010-09-21 22:12:23 UTC (rev 12996)
@@ -1,3 +1,2 @@
 build_fix.patch
-pom.xml.patch
 

Modified: trunk/jakarta-log4j/debian/rules
===================================================================
--- trunk/jakarta-log4j/debian/rules	2010-09-21 21:53:52 UTC (rev 12995)
+++ trunk/jakarta-log4j/debian/rules	2010-09-21 22:12:23 UTC (rev 12996)
@@ -16,6 +16,7 @@
 ANT_HOME  := /usr/share/ant
 DEB_JARS  := gnumail activation
 DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_ARGS := -Dversion=$(VERSION)
 
 clean::
 	-$(RM) -r docs