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

[Gabriele Giacone]

Author: gg0-guest
Date: 2010-02-24 01:55:50 +0000 (Wed, 24 Feb 2010)
New Revision: 11691

Added:
   trunk/jakarta-log4j/debian/maven.ignoreRules
   trunk/jakarta-log4j/debian/patches/00list
   trunk/jakarta-log4j/debian/patches/02_pom.xml.patch
Modified:
   trunk/jakarta-log4j/debian/changelog
   trunk/jakarta-log4j/debian/compat
   trunk/jakarta-log4j/debian/control
   trunk/jakarta-log4j/debian/maven.rules
Log:
fixed maven support #571046

Modified: trunk/jakarta-log4j/debian/changelog
===================================================================
--- trunk/jakarta-log4j/debian/changelog	2010-02-23 16:27:22 UTC (rev 11690)
+++ trunk/jakarta-log4j/debian/changelog	2010-02-24 01:55:50 UTC (rev 11691)
@@ -1,3 +1,13 @@
+jakarta-log4j (1.2.15-10) unstable; urgency=low
+
+  * Fixed Maven support (Closes: #571046)
+    - d/m.ignoreRules: added JMX stuff
+    - pom.xml patch : javax.jms and java.mail set as optional
+  * Standards-Version to 3.8.4
+  * debhelper compat to 7
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Wed, 24 Feb 2010 02:33:46 +0100
+
 jakarta-log4j (1.2.15-9) unstable; urgency=low
 
   * Added libjboss-jmx-java to suggests:

Modified: trunk/jakarta-log4j/debian/compat
===================================================================
--- trunk/jakarta-log4j/debian/compat	2010-02-23 16:27:22 UTC (rev 11690)
+++ trunk/jakarta-log4j/debian/compat	2010-02-24 01:55:50 UTC (rev 11691)
@@ -1 +1 @@
-5
+7

Modified: trunk/jakarta-log4j/debian/control
===================================================================
--- trunk/jakarta-log4j/debian/control	2010-02-23 16:27:22 UTC (rev 11690)
+++ trunk/jakarta-log4j/debian/control	2010-02-24 01:55:50 UTC (rev 11691)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Kalle Kivimaa <killer at debian.org>, Michael Koch <konqueror at gmx.de>, Varun Hiremath <varun at debian.org>, Kumar Appaiah <akumar at debian.org>, Torsten Werner <twerner at debian.org>, Thomas Koch <thomas.koch at ymc.ch>
-Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant, libgnujaf-java,
+Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, ant, libgnujaf-java,
  libgnumail-java, maven-repo-helper, openjdk-6-doc, libjboss-jmx-java
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 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

Added: trunk/jakarta-log4j/debian/maven.ignoreRules
===================================================================
--- trunk/jakarta-log4j/debian/maven.ignoreRules	                        (rev 0)
+++ trunk/jakarta-log4j/debian/maven.ignoreRules	2010-02-24 01:55:50 UTC (rev 11691)
@@ -0,0 +1,2 @@
+com.sun.jmx jmxri jar *
+com.sun.jdmk jmxtools jar *

Modified: trunk/jakarta-log4j/debian/maven.rules
===================================================================
--- trunk/jakarta-log4j/debian/maven.rules	2010-02-23 16:27:22 UTC (rev 11690)
+++ trunk/jakarta-log4j/debian/maven.rules	2010-02-24 01:55:50 UTC (rev 11691)
@@ -1,3 +1,2 @@
 s/ant/org.apache.ant/ * * s/.*/debian/ *
 log4j log4j jar s/1\.2\..*/1.2.x/
-

Added: trunk/jakarta-log4j/debian/patches/00list
===================================================================
--- trunk/jakarta-log4j/debian/patches/00list	                        (rev 0)
+++ trunk/jakarta-log4j/debian/patches/00list	2010-02-24 01:55:50 UTC (rev 11691)
@@ -0,0 +1,2 @@
+01_build_fix.patch
+02_pom.xml.patch

Added: trunk/jakarta-log4j/debian/patches/02_pom.xml.patch
===================================================================
--- trunk/jakarta-log4j/debian/patches/02_pom.xml.patch	                        (rev 0)
+++ trunk/jakarta-log4j/debian/patches/02_pom.xml.patch	2010-02-24 01:55:50 UTC (rev 11691)
@@ -0,0 +1,24 @@
+#! /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@
+diff -urNad jakarta-log4j~/pom.xml jakarta-log4j/pom.xml
+--- jakarta-log4j~/pom.xml	2007-08-25 06:09:43.000000000 +0200
++++ jakarta-log4j/pom.xml	2010-02-24 00:32:37.000000000 +0100
+@@ -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>


Property changes on: trunk/jakarta-log4j/debian/patches/02_pom.xml.patch
___________________________________________________________________
Added: svn:executable
   + *