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 021791c9bde3c240780094c7ba10ee447fe90d36
Author: Ludovic Claude <ludovic.cla...@laposte.net>
Date: Tue Sep 28 21:18:24 2010 +0000
* Initial release
---
debian/README.Debian | 70 ++++++++++
debian/README.Debian-source | 8 ++
debian/changelog | 255 +++++++++++++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 72 ++++++++++
debian/copyright | 44 ++++++
debian/dirs | 1 +
debian/liblog4j1.2-java-doc.doc-base | 10 ++
debian/liblog4j1.2-java-doc.install | 1 +
debian/liblog4j1.2-java.poms | 1 +
debian/log4j.bnd | 8 ++
debian/maven.ignoreRules | 2 +
debian/maven.rules | 2 +
debian/orig-tar.sh | 22 +++
debian/patches/build_fix.patch | 54 ++++++++
debian/patches/series | 2 +
debian/rules | 44 ++++++
debian/source/format | 1 +
debian/watch | 2 +
19 files changed, 600 insertions(+)
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..2204c21
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,70 @@
+jakarta-log4j1.2 for Debian
+------------------------
+
+This is the jakarta logging library version 1.2. If your package depends on it
+please use the /usr/share/java/log4j-1.2.jar symlink.
+
+Some information from the INSTALL documentation:
+
+You can now test your installation by first compiling the following
+simple program.
+
+ import org.apache.log4j.Logger;
+ import org.apache.log4j.BasicConfigurator;
+
+ public class Hello {
+
+ static Logger logger = Logger.getLogger(Hello.class);
+
+ public
+ static
+ void main(String argv[]) {
+ BasicConfigurator.configure();
+ logger.debug("Hello world.");
+ logger.info("What a beautiful day.");
+ }
+ }
+
+ After compilation, try it out by issuing the command
+
+ java Hello
+
+ You should see log statements appearing on the console.
+
+Refer to the javadoc documentation and the user manual on how to
+include log statements in your own code.
+
+
+==================
+log4j dependencies
+==================
+
+Log4j is based on JDK 1.1 with the following additional requirements:
+
+ ----------------------------
+ Package org.apache.log4j.xml
+ ----------------------------
+
+ The DOMConfigurator is based on the DOM Level 1 API. The
+ DOMConfigurator.configure(Element) method will work with any
+ XML parser that will pass it a DOM tree.
+
+ The DOMConfigurator.configure(String filename) method and its variants
+ require a JAXP compatible XMLparser, for example the Apache Xerces
+ parser. Compiling the DOMConfigurator requires the presence of a
+ JAXP parser in the classpath.
+
+ ------------
+ SMTPAppender
+ ------------
+
+ The SMTPAppender relies on the JavaMail API. It has been tested with
+ JavaMail API version 1.2. The JavaMail API requires the
+ JavaBeans Activation Framework package. You can download the
+ JavaMail API at:
+
+ http://java.sun.com/products/javamail/
+
+ or just apt-get install libgnumail-java in Debian :-)
+
+ -- Benoit Joly <ben...@kaitain.dune.local>, Sat Apr 12 18:36:10 2003
diff --git a/debian/README.Debian-source b/debian/README.Debian-source
new file mode 100644
index 0000000..535d85f
--- /dev/null
+++ b/debian/README.Debian-source
@@ -0,0 +1,8 @@
+jakarta-log4j1.2
+----------------
+
+The package includes jars and a Windows binary DLL, which are not be
+included in the original tarball. The orig-tar.sh in this directory is
+used to recreate a clean tarball by removing the jar and DLL.
+
+ -- Kumar Appaiah <aku...@ee.iitm.ac.in>, Wed, 26 Sep 2007 13:03:52 +0530
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..85a553c
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,255 @@
+apache-log4j1.2 (1.2.16-1) experimental; urgency=low
+
+ * Add myself to uploaders
+ * Rename source package to apache-log4j1.2 (Closes: #598007)
+ * d/maven.rules: use * instead of jar to match log4j, as
+ version 1.2.16 has a pom type of 'bundle' and this
+ means that the version installed in the Maven repository
+ is 'debian' instead of '1.2.x'
+ * d/control: update Homepage to reflect the new location of log4j
+ * include OSGi metadata in the jar, add Build-Depends on bnd
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Sun, 26 Sep 2010 22:24:25
+0200
+
+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)
+ + Add Suggests on liblog4j1.2-java-doc
+ * Remove pom.xml.patch, changes applied upstream,
+ refresh build.xml.patch
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Fri, 14 May 2010 00:11:30
+0200
+
+jakarta-log4j (1.2.15-11) unstable; urgency=low
+
+ * Team upload.
+ * 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 all java runtimes and java-common
+ (Closes: #576737)
+ * Source format 3.0 (quilt)
+ - removed quilt as build dependency
+ - removed include patchsys-quilt.mk in d/rules
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Mon, 05 Apr 2010 16:30:15
+0200
+
+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 <1o5g4...@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:
+
+ -- Thomas Koch <thomas.k...@ymc.ch> Thu, 14 Jan 2010 15:51:45 +0100
+
+jakarta-log4j (1.2.15-8) unstable; urgency=low
+
+ * Build with jmx support
+
+ -- Thomas Koch <thomas.k...@ymc.ch> Tue, 12 Jan 2010 11:02:21 +0100
+
+jakarta-log4j (1.2.15-7) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- Torsten Werner <twer...@debian.org> Sun, 09 Aug 2009 11:25:57 +0200
+
+jakarta-log4j (1.2.15-6) experimental; urgency=low
+
+ [ Ludovic Claude ]
+ * Add the Maven POM to the package
+ * Add a Build-Depends dependency on maven-repo-helper
+ * Move API documentation to /usr/share/doc/liblog4j1.2-java/api
+
+ [ Torsten Werner ]
+ * Fix doc-base file.
+
+ -- Torsten Werner <twer...@debian.org> Sun, 02 Aug 2009 21:51:13 +0200
+
+jakarta-log4j (1.2.15-5) unstable; urgency=low
+
+ * Add myself to Uploaders.
+ * Do no longer quote the full text of the Apache-2.0 license.
+ * Add missing Depends: ${misc:Depends}.
+ * Change Section: java.
+ * Update Standards-Version: 3.8.2 (no changes).
+ * Fix spelling api -> API.
+
+ -- Torsten Werner <twer...@debian.org> Thu, 30 Jul 2009 18:24:10 +0200
+
+jakarta-log4j (1.2.15-4) unstable; urgency=low
+
+ * liblog4j-java: Depend on default-jre-headless as the preferred runtime,
+ keep the existing alternatives for now.
+
+ -- Matthias Klose <d...@debian.org> Mon, 04 Aug 2008 23:55:26 +0200
+
+jakarta-log4j (1.2.15-3) unstable; urgency=medium
+
+ * debian/control:
+ + Use default-java-jdk in place of java-gcj-compat-dev.
+ (Closes: #477866)
+ + Switch to use Varun and Kumar's debian.org addresses.
+ + Standards version is now 3.7.3 (No changes needed).
+ + Use Vcs-Broswer and Vcs-Svn in place of XS-Vcs-*.
+ * debian/rules:
+ + Switch JAVA_HOME location to /usr/lib/jvm/default-java.
+ * debian/copright:
+ + Update to UTF-8, and add a copyright for the Apache Software
+ Foundartion.
+
+ -- Kumar Appaiah <aku...@debian.org> Sun, 27 Apr 2008 17:35:01 +0530
+
+jakarta-log4j (1.2.15-2) unstable; urgency=low
+
+ [ Matthias Klose ]
+ * Really build the native jars, don't ship an empty package. Closes: #453941.
+
+ -- Kumar Appaiah <aku...@ee.iitm.ac.in> Sun, 02 Dec 2007 20:24:35 +0530
+
+jakarta-log4j (1.2.15-1) unstable; urgency=low
+
+ [ Kumar Appaiah ]
+ * New upstream release.
+ * debian/compat: bumped to 5.
+ * debian/watch: Added file.
+ * debian/control:
+ + Added Kumar Appaiah and Varun Hiremath to Uploaders.
+ + Moved all build dependencencies to Build-Depends.
+ + Depend on cdbs.
+ + Added Homepage, XS-Vcs-Svn and XS-Vcs-Browser fields.
+ * debian/liblog4j1.2-java-doc.doc-base: Specigy API doc location.
+ * debian/liblog4j1.2-java.links: Removed. Functionality in debian/rules.
+ * debian/orig-tar.sh: Added to ease repackaging.
+ * debian/README.Debian-source: Added to explain repackaging.
+ * debian/patches/01_build_fix.patch: Fix javadoc issues and compiler target
versions.
+ * debian/rules:
+ + Move to cdbs.
+ + Ensure we build native jars.
+ + Ensure the generated docs are removed to prevent an FTBFS on successive
builds.
+
+ [ Varun Hiremath ]
+ * Ensure upstream javadocs are removed while repackaging.
+
+ -- Varun Hiremath <varunhirem...@gmail.com> Fri, 28 Sep 2007 15:30:56 +0530
+
+jakarta-log4j (1.2.13-5) unstable; urgency=low
+
+ * Rename source package. Closes: #308339.
+ * Updated Standard-Version to 3.7.2.
+
+ -- Michael Koch <konque...@gmx.de> Sun, 15 Jul 2007 15:35:02 +0200
+
+jakarta-log4j1.2 (1.2.13-4) unstable; urgency=low
+
+ * Build a liblog4j1.2-java-gcj package. Closes: #427243.
+ * Updated package descriptions.
+ * Removed Wolfgang and added myself to Uploaders.
+
+ -- Michael Koch <konque...@gmx.de> Sat, 30 Jun 2007 10:45:43 -0100
+
+jakarta-log4j1.2 (1.2.13-3) unstable; urgency=low
+
+ * Build using java-gcj-compat-dev (merged from Ubuntu).
+
+ -- Matthias Klose <d...@debian.org> Fri, 8 Dec 2006 10:45:35 +0100
+
+jakarta-log4j1.2 (1.2.13-2) unstable; urgency=low
+
+ * Added binary-arch build target (noop) (closes: #395615)
+
+ -- Kalle Kivimaa <kil...@debian.org> Sat, 28 Oct 2006 08:30:00 +0300
+
+jakarta-log4j1.2 (1.2.13-1) unstable; urgency=low
+
+ * New upstream release
+ * kaffe compiler transition
+ * Remove build dependencies on libcrimson-java, libjaxp1.2-java (not needed)
+ * Build javadoc from source
+ * Updated README.Debian to what we actually build
+
+ -- Wolfgang Baer <wb...@gmx.de> Wed, 18 Jan 2006 17:33:47 +0100
+
+jakarta-log4j1.2 (1.2.12-1) unstable; urgency=low
+
+ * New upstream release (closes: #328253)
+ + Apache License 2.0 - updated debian/copyright
+ * Use kaffe for building instead of jikes alone
+ Fixes the FTBS (closes: #334634)
+ * Remove useless parts from README.Debian
+ * Standards-Version 3.6.2 (no changes)
+ * Don't depend on java-common
+ * Remove outdated log4j 1.1 section from description
+ * Register manual with doc-base
+ * Add myself to uploaders
+
+ -- Wolfgang Baer <wb...@gmx.de> Fri, 28 Oct 2005 21:52:06 +0200
+
+jakarta-log4j1.2 (1.2.9-1) unstable; urgency=low
+
+ * New upstream version (differs from 1.2.8 only in that some methods
+ are deprecated in preparation for 1.3)
+ * Javadocs are now retained from the upstream distribution.
+ This is just a temporary measure until gjdoc works (closes: #265746)
+
+ -- Kalle Kivimaa <kil...@debian.org> Sat, 13 Nov 2004 16:00:00 +0200
+
+jakarta-log4j1.2 (1.2.8-7) unstable; urgency=high
+
+ * Javadocs are now correctly generated (closes: #265746)
+
+ -- Kalle Kivimaa <kil...@debian.org> Sun, 15 Aug 2004 15:00:00 +0300
+
+jakarta-log4j1.2 (1.2.8-6) unstable; urgency=high
+
+ * rules script now correctly includes log4j.dtd (closes: #265704)
+ * Bogus libmx4j-java classes removed from jikes classpath (closes: #265710)
+
+ -- Kalle Kivimaa <kil...@debian.org> Sat, 14 Aug 2004 18:00:00 +0300
+
+jakarta-log4j1.2 (1.2.8-5) unstable; urgency=low
+
+ * rules script was missing two removes related to bug #221236.
+
+ -- Kalle Kivimaa <kil...@debian.org> Fri, 13 Aug 2004 12:30:00 +0300
+
+jakarta-log4j1.2 (1.2.8-4) unstable; urgency=low
+
+ * Builds from source (closes: #221236) (removed chainsaw and lf5
+ parts, these will be available in liblog4j1.2-contrib-java)
+ * Adopted the package to pkg-java-maintainers (closes: #263869)
+
+ -- Kalle Kivimaa <kil...@debian.org> Fri, 13 Aug 2004 11:00:00 +0300
+
+jakarta-log4j1.2 (1.2.8-3) unstable; urgency=low
+
+ * Changed section from contrib to main. (closes: #237362, #230441)
+ * Modified depends to depend on java1-runtime or java2-runtime.
+
+ -- Benoit Joly <ben...@debian.org> Sat, 27 Mar 2004 15:42:06 -0500
+
+jakarta-log4j1.2 (1.2.8-2) unstable; urgency=low
+
+ * New description.
+
+ -- Benoit Joly <ben...@debian.org> Wed, 23 Apr 2003 00:14:26 -0400
+
+jakarta-log4j1.2 (1.2.8-1) unstable; urgency=low
+
+ * New package for version 1.2 of the log4j API. (closes: #188708)
+
+ -- Benoit Joly <ben...@debian.org> Thu, 10 Apr 2003 00:03:47 -0400
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..664263d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,72 @@
+Source: apache-log4j1.2
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Kalle Kivimaa <kil...@debian.org>, Michael Koch <konque...@gmx.de>,
Varun Hiremath <va...@debian.org>, Kumar Appaiah <aku...@debian.org>, Torsten
Werner <twer...@debian.org>, Thomas Koch <thomas.k...@ymc.ch>, Ludovic Claude
<ludovic.cla...@laposte.net>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, ant,
libgnujaf-java,
+ libgnumail-java, maven-repo-helper, default-jdk-doc, libjboss-jmx-java, bnd
+Standards-Version: 3.9.1
+Homepage: http://logging.apache.org/log4j/1.2/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jakarta-log4j
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jakarta-log4j
+
+Package: liblog4j1.2-java
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: liblog4j1.2-java-gcj, liblog4j1.2-java-doc, libgnumail-java,
libjboss-jmx-java
+Description: Logging library for java
+ log4j is a tool to help the programmer output log statements to a variety of
+ output targets.
+ .
+ It is possible to enable logging at runtime without modifying the application
+ binary. The log4j package is designed so that log statements can remain in
+ shipped code without incurring a high performance cost.
+ .
+ One of the distinctive features of log4j is the notion of hierarchical
+ loggers. Using loggers it is possible to selectively control which log
+ statements are output at arbitrary granularity.
+ .
+ Log4j can output to: a file, a rolling file, a database with a JDBC driver,
+ many ouput asynchronously, a JMS Topic, a swing based logging console,
+ the NT event log, /dev/null, a SMTP server (using javamail), a socket server,
+ syslog, telnet daemon and stdout.
+ .
+ The format of the output can be defined using one of the various layout
+ (or user defined layout) like: simple text, html, date, pattern defined and
+ XML.
+
+Package: liblog4j1.2-java-gcj
+Architecture: any
+Section: libs
+Depends: liblog4j1.2-java (>= ${source:Version}), ${misc:Depends},
${shlibs:Depends}
+Description: Logging library for java (native code)
+ log4j is a tool to help the programmer output log statements to a variety of
+ output targets.
+ .
+ It is possible to enable logging at runtime without modifying the application
+ binary. The log4j package is designed so that log statements can remain in
+ shipped code without incurring a high performance cost.
+ .
+ One of the distinctive features of log4j is the notion of hierarchical
+ loggers. Using loggers it is possible to selectively control which log
+ statements are output at arbitrary granularity.
+ .
+ Log4j can output to: a file, a rolling file, a database with a JDBC driver,
+ many ouput asynchronously, a JMS Topic, a swing based logging console,
+ the NT event log, /dev/null, a SMTP server (using javamail), a socket server,
+ syslog, telnet daemon and stdout.
+ .
+ The format of the output can be defined using one of the various layout
+ (or user defined layout) like: simple text, html, date, pattern defined and
+ XML.
+ .
+ This package contains the natively compiled code for use by gij.
+
+Package: liblog4j1.2-java-doc
+Architecture: all
+Section: 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
+ for the version 1.2 of the log4j API.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..290c4f3
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+This package was debianized by Benoit Joly <ben...@debian.org> on
+Sat Apr 12 2003 18:32:20 -0400.
+
+It was downloaded from:
+ http://logging.apache.org/log4j/1.2/download.html
+
+Upstream Authors:
+ Copyright (C) 1999-2007, The Apache Software Foundation
+ Contributors:
+ Mathias Bogaert
+ James P. Cakalic
+ Paul Glezen
+ Ceki Gülcü
+ Anders Kristensen
+ Jim Moore
+ Jon Skeet
+ Chris Taylor
+
+For more details about the upstream authors, see:
http://jakarta.apache.org/log4j/docs/contributors.html
+
+License: Apache-2.0
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+The full text of the license can be found in
+`/usr/share/common-licenses/Apache-2.0'.
+
+Debian packaging: (C) 2001 - 2004, Benoit Joly <ben...@debian.org>
+ (C) 2005 - 2007, Kalle Kivimaa <kil...@debian.org>
+ (C) 2005 - 2007, Wolfgang Baer <wb...@gmx.de>, Michael Koch
<konque...@gmx.de>
+ (C) 2007 Varun Hiremath <varunhirem...@gmail.com>, Kumar
Appaiah <aku...@ee.iitm.ac.in>
+
+The Debian packaging of this package is licensed under the Apache
+Software License 2.0 (see above).
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..13c9f03
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/share/java
diff --git a/debian/liblog4j1.2-java-doc.doc-base
b/debian/liblog4j1.2-java-doc.doc-base
new file mode 100644
index 0000000..96dcb25
--- /dev/null
+++ b/debian/liblog4j1.2-java-doc.doc-base
@@ -0,0 +1,10 @@
+Document: liblog4j1.2-java-doc
+Title: Documenation for log4j 1.2
+Author: The Apache log4j team
+Abstract: This is the documentation for log4j, a logging library
+ for java. The documentation includes the javadoc API.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/liblog4j1.2-java/api/index.html
+Files: /usr/share/doc/liblog4j1.2-java/api/*.html
diff --git a/debian/liblog4j1.2-java-doc.install
b/debian/liblog4j1.2-java-doc.install
new file mode 100644
index 0000000..e57eff3
--- /dev/null
+++ b/debian/liblog4j1.2-java-doc.install
@@ -0,0 +1 @@
+docs/api usr/share/doc/liblog4j1.2-java
diff --git a/debian/liblog4j1.2-java.poms b/debian/liblog4j1.2-java.poms
new file mode 100644
index 0000000..d4f7111
--- /dev/null
+++ b/debian/liblog4j1.2-java.poms
@@ -0,0 +1 @@
+pom.xml
diff --git a/debian/log4j.bnd b/debian/log4j.bnd
new file mode 100644
index 0000000..fcc45c5
--- /dev/null
+++ b/debian/log4j.bnd
@@ -0,0 +1,8 @@
+version=VERSION
+Export-Package:
!org.apache.log4j.lf5.*,!org.apache.log4j.chainsaw.*,org.apache.log4j.*
+Import-Package:
com.sun.jdmk.comm;resolution:=optional,javax.jms;resolution:=optional,javax.mail.*;resolution:=optional,javax.management;resolution:=optional,javax.naming;resolution:=optional,com.sun.jdmk.comm;resolution:=optional,com.ibm.uvm.tools;resolution:=optional,javax.swing.*;resolution:=optional,*
+Bundle-Version: ${version}
+Bundle-Description: Apache Log4j 1.2
+Bundle-Name: org.apache.log4j
+Bundle-DocURL: http://logging.apache.org/log4j/1.2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..9448fa7
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,2 @@
+com.sun.jmx jmxri jar *
+com.sun.jdmk jmxtools jar *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..342518c
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+s/ant/org.apache.ant/ * * s/.*/debian/ *
+log4j log4j * s/1\.2\..*/1.2.x/
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..9cab87c
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+VERSION=$2
+ORIG_TAR=$3
+TAR=../apache-log4j1.2_$VERSION.orig.tar.gz
+DIR=apache-log4j1.2-$VERSION.orig
+
+# clean up the upstream tarball
+tar xvzf $ORIG_TAR
+mv apache-log4j-$VERSION $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude 'site' --exclude
'*.dll' $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
+fi
+
+exit 0
diff --git a/debian/patches/build_fix.patch b/debian/patches/build_fix.patch
new file mode 100644
index 0000000..126d220
--- /dev/null
+++ b/debian/patches/build_fix.patch
@@ -0,0 +1,54 @@
+--- a/build.xml
++++ b/build.xml
+@@ -99,8 +99,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"/>
+@@ -167,12 +167,12 @@
+ <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="${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>
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e83cfa1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+build_fix.patch
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..81a6b23
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,44 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+# Decide whether we need native jars.
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+ with_gcj_native := yes
+endif
+
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
+DEB_JARS := gnumail activation
+DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_ARGS := -Dversion=$(VERSION)
+
+clean::
+ -$(RM) -r docs
+ -rm -rf debian/tmp
+
+common-build-indep::
+ cat debian/log4j.bnd | sed s/VERSION/$(VERSION)/ >
debian/.log4j-versioned.bnd
+ java -jar /usr/share/java/bnd.jar wrap -properties
debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
+ java -jar /usr/share/java/bnd.jar wrap -properties
debian/.log4j-versioned.bnd \
+ -classpath
/usr/share/java/jboss-jmx.jar,/usr/share/java/gnumail.jar,/usr/share/java/activation.jar
\
+ -output log4j.jar dist/lib/log4j-$(VERSION).jar
+ rm debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
+ mv log4j.jar dist/lib/log4j-$(VERSION).jar
+
+install/liblog4j1.2-java::
+ mh_installpoms -pliblog4j1.2-java
+ mh_installjar -pliblog4j1.2-java -l --usj-name=log4j-1.2 pom.xml
dist/lib/log4j-$(VERSION).jar
+
+ifeq ($(with_gcj_native),yes)
+install/liblog4j1.2-java-gcj:: install/liblog4j1.2-java
+ dh_nativejava -pliblog4j1.2-java-gcj
+endif
+
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..09cca86
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/logging/log4j/(1.2.[\d]+)/apache-log4j-(1.2.[\d]+).tar.gz
debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/apache-log4j1.2.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
