[pkg-java] r12033 - in trunk/jakarta-log4j/debian: . source

[Ludovic Claude]

Author: ludovicc-guest
Date: 2010-04-06 21:05:59 +0000 (Tue, 06 Apr 2010)
New Revision: 12033

Added:
   trunk/jakarta-log4j/debian/source/
   trunk/jakarta-log4j/debian/source/format
Modified:
   trunk/jakarta-log4j/debian/changelog
   trunk/jakarta-log4j/debian/control
   trunk/jakarta-log4j/debian/rules
Log:


Modified: trunk/jakarta-log4j/debian/changelog
===================================================================
--- trunk/jakarta-log4j/debian/changelog	2010-04-06 20:25:12 UTC (rev 12032)
+++ trunk/jakarta-log4j/debian/changelog	2010-04-06 21:05:59 UTC (rev 12033)
@@ -1,8 +1,15 @@
-jakarta-log4j (1.2.15-11) UNRELEASED; urgency=low
+jakarta-log4j (1.2.15-11) unstable; 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)
+  * Use default-jdk-doc instead of classpath-doc/openjdk-6-doc
+    (Closes: #567275)
+  * Remove dependencies on deprecated java1-runtime and
+    java1-headless-runtime
+  * Source format 3.0 (quilt)
+    - removed quilt as build dependency
+    - removed include patchsys-quilt.mk in d/rules 
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 05 Apr 2010 16:30:15 +0200
 

Modified: trunk/jakarta-log4j/debian/control
===================================================================
--- trunk/jakarta-log4j/debian/control	2010-04-06 20:25:12 UTC (rev 12032)
+++ trunk/jakarta-log4j/debian/control	2010-04-06 21:05:59 UTC (rev 12033)
@@ -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, quilt
+ libgnumail-java, maven-repo-helper, default-jdk-doc, libjboss-jmx-java
 Standards-Version: 3.8.4
 Homepage: http://jakarta.apache.org/log4j
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jakarta-log4j
@@ -12,7 +12,7 @@
 
 Package: liblog4j1.2-java
 Architecture: all
-Depends: java-common, default-jre-headless | java2-runtime-headless | java1-runtime-headless | java2-runtime | java1-runtime, ${misc:Depends}
+Depends: java-common, default-jre-headless | java2-runtime-headless | java2-runtime, ${misc:Depends}
 Recommends: liblog4j1.2-java-gcj
 Suggests: libgnumail-java, libjboss-jmx-java
 Description: Logging library for java
@@ -66,7 +66,7 @@
 Package: liblog4j1.2-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
+Depends: ${misc:Depends}, default-jdk-doc
 Description: Documentation for liblog4j1.2-java
  The javadoc API documentation for the logging library
  from the Apache Jakarta project. The documentation is

Modified: trunk/jakarta-log4j/debian/rules
===================================================================
--- trunk/jakarta-log4j/debian/rules	2010-04-06 20:25:12 UTC (rev 12032)
+++ trunk/jakarta-log4j/debian/rules	2010-04-06 21:05:59 UTC (rev 12033)
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.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)

Added: trunk/jakarta-log4j/debian/source/format
===================================================================
--- trunk/jakarta-log4j/debian/source/format	                        (rev 0)
+++ trunk/jakarta-log4j/debian/source/format	2010-04-06 21:05:59 UTC (rev 12033)
@@ -0,0 +1 @@
+3.0 (quilt)