[pkg-java] r12020 - in trunk/jakarta-log4j/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Mon Apr 5 21:52:50 UTC 2010
Author: ludovicc-guest
Date: 2010-04-05 21:52:46 +0000 (Mon, 05 Apr 2010)
New Revision: 12020
Added:
trunk/jakarta-log4j/debian/patches/build_fix.patch
trunk/jakarta-log4j/debian/patches/pom.xml.patch
trunk/jakarta-log4j/debian/patches/series
Removed:
trunk/jakarta-log4j/debian/patches/00list
trunk/jakarta-log4j/debian/patches/01_build_fix.patch
trunk/jakarta-log4j/debian/patches/02_pom.xml.patch
Modified:
trunk/jakarta-log4j/debian/changelog
trunk/jakarta-log4j/debian/control
trunk/jakarta-log4j/debian/rules
Log:
* Move the patches to quilt, add a Build-Depends on quilt
* JMX package is built and patch from Thomas Koch has been applied
with changes (Closes: #503837)
Modified: trunk/jakarta-log4j/debian/changelog
===================================================================
--- trunk/jakarta-log4j/debian/changelog 2010-04-05 21:51:45 UTC (rev 12019)
+++ trunk/jakarta-log4j/debian/changelog 2010-04-05 21:52:46 UTC (rev 12020)
@@ -1,3 +1,11 @@
+jakarta-log4j (1.2.15-11) UNRELEASED; urgency=low
+
+ * Move the patches to quilt, add a Build-Depends on quilt
+ * JMX package is built and patch from Thomas Koch has been applied
+ with changes (Closes: #503837)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Mon, 05 Apr 2010 16:30:15 +0200
+
jakarta-log4j (1.2.15-10) unstable; urgency=low
* Fixed Maven support (Closes: #571046)
Modified: trunk/jakarta-log4j/debian/control
===================================================================
--- trunk/jakarta-log4j/debian/control 2010-04-05 21:51:45 UTC (rev 12019)
+++ trunk/jakarta-log4j/debian/control 2010-04-05 21:52:46 UTC (rev 12020)
@@ -4,7 +4,7 @@
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 (>= 7), cdbs, default-jdk-builddep, ant, libgnujaf-java,
- libgnumail-java, maven-repo-helper, openjdk-6-doc, libjboss-jmx-java
+ libgnumail-java, maven-repo-helper, openjdk-6-doc, libjboss-jmx-java, quilt
Standards-Version: 3.8.4
Homepage: http://jakarta.apache.org/log4j
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jakarta-log4j
Deleted: trunk/jakarta-log4j/debian/patches/00list
===================================================================
--- trunk/jakarta-log4j/debian/patches/00list 2010-04-05 21:51:45 UTC (rev 12019)
+++ trunk/jakarta-log4j/debian/patches/00list 2010-04-05 21:52:46 UTC (rev 12020)
@@ -1,2 +0,0 @@
-01_build_fix.patch
-02_pom.xml.patch
Deleted: trunk/jakarta-log4j/debian/patches/01_build_fix.patch
===================================================================
--- trunk/jakarta-log4j/debian/patches/01_build_fix.patch 2010-04-05 21:51:45 UTC (rev 12019)
+++ trunk/jakarta-log4j/debian/patches/01_build_fix.patch 2010-04-05 21:52:46 UTC (rev 12020)
@@ -1,55 +0,0 @@
---- 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"/>
-
-- <property name="javac.source" value="1.2"/>
-- <property name="javac.target" value="1.1"/>
-+ <property name="javac.source" value="1.3"/>
-+ <property name="javac.target" value="1.3"/>
-
- <!-- 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"
- use="true"
-- overview="${docs.dest}/overview.html"
- doctitle="log4j version ${version}<br>API Specification"
- windowtitle="Log4j Version ${version}"
- header='<b>Log4j ${version}</b><!-- Licensed to the Apache Software Foundation (ASF) under one or more
-@@ -517,8 +516,6 @@
- -->'
- bottom="Copyright 2000-2007 Apache Software Foundation.">
-
-- <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
-- <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
- <classpath refid="compile.classpath"/>
- </javadoc>
-
Deleted: trunk/jakarta-log4j/debian/patches/02_pom.xml.patch
===================================================================
--- trunk/jakarta-log4j/debian/patches/02_pom.xml.patch 2010-04-05 21:51:45 UTC (rev 12019)
+++ trunk/jakarta-log4j/debian/patches/02_pom.xml.patch 2010-04-05 21:52:46 UTC (rev 12020)
@@ -1,24 +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@
-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>
Added: trunk/jakarta-log4j/debian/patches/build_fix.patch
===================================================================
--- trunk/jakarta-log4j/debian/patches/build_fix.patch (rev 0)
+++ trunk/jakarta-log4j/debian/patches/build_fix.patch 2010-04-05 21:52:46 UTC (rev 12020)
@@ -0,0 +1,55 @@
+--- 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"/>
+
+- <property name="javac.source" value="1.2"/>
+- <property name="javac.target" value="1.1"/>
++ <property name="javac.source" value="1.3"/>
++ <property name="javac.target" value="1.3"/>
+
+ <!-- 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"
+ use="true"
+- overview="${docs.dest}/overview.html"
+ doctitle="log4j version ${version}<br>API Specification"
+ windowtitle="Log4j Version ${version}"
+ header='<b>Log4j ${version}</b><!-- Licensed to the Apache Software Foundation (ASF) under one or more
+@@ -517,8 +516,6 @@
+ -->'
+ bottom="Copyright 2000-2007 Apache Software Foundation.">
+
+- <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
+- <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
+ <classpath refid="compile.classpath"/>
+ </javadoc>
+
Added: trunk/jakarta-log4j/debian/patches/pom.xml.patch
===================================================================
--- trunk/jakarta-log4j/debian/patches/pom.xml.patch (rev 0)
+++ trunk/jakarta-log4j/debian/patches/pom.xml.patch 2010-04-05 21:52:46 UTC (rev 12020)
@@ -0,0 +1,23 @@
+#! /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>
Added: trunk/jakarta-log4j/debian/patches/series
===================================================================
--- trunk/jakarta-log4j/debian/patches/series (rev 0)
+++ trunk/jakarta-log4j/debian/patches/series 2010-04-05 21:52:46 UTC (rev 12020)
@@ -0,0 +1,3 @@
+build_fix.patch
+pom.xml.patch
+
Modified: trunk/jakarta-log4j/debian/rules
===================================================================
--- trunk/jakarta-log4j/debian/rules 2010-04-05 21:51:45 UTC (rev 12019)
+++ trunk/jakarta-log4j/debian/rules 2010-04-05 21:52:46 UTC (rev 12020)
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# Decide whether we need native jars.
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
More information about the pkg-java-commits
mailing list