[pkg-java] r15015 - trunk/apache-log4j1.2/debian
Torsten Werner
twerner at alioth.debian.org
Fri Sep 23 21:05:28 UTC 2011
Author: twerner
Date: 2011-09-23 21:05:28 +0000 (Fri, 23 Sep 2011)
New Revision: 15015
Modified:
trunk/apache-log4j1.2/debian/README.Debian
trunk/apache-log4j1.2/debian/changelog
trunk/apache-log4j1.2/debian/control
trunk/apache-log4j1.2/debian/rules
Log:
is 'debian' instead of '1.2.x' (Closes: #618263)
* Add --has-package-version to libapache-log4j1.2-java.poms
* Deploy javadoc jar into the Maven repository
* Updated Vcs-* fields.
* Remove Kalle from Uploaders list.
* Do no longer build the liblog4j1.2-java-gcj package.
* Fix type in Description.
Modified: trunk/apache-log4j1.2/debian/README.Debian
===================================================================
--- trunk/apache-log4j1.2/debian/README.Debian 2011-09-23 20:05:25 UTC (rev 15014)
+++ trunk/apache-log4j1.2/debian/README.Debian 2011-09-23 21:05:28 UTC (rev 15015)
@@ -1,7 +1,7 @@
-jakarta-log4j1.2 for Debian
-------------------------
+apache-log4j1.2 for Debian
+--------------------------
-This is the jakarta logging library version 1.2. If your package depends on it
+This is the apache 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:
Modified: trunk/apache-log4j1.2/debian/changelog
===================================================================
--- trunk/apache-log4j1.2/debian/changelog 2011-09-23 20:05:25 UTC (rev 15014)
+++ trunk/apache-log4j1.2/debian/changelog 2011-09-23 21:05:28 UTC (rev 15015)
@@ -1,32 +1,27 @@
-apache-log4j1.2 (1.2.16-3) UNRELEASED; urgency=low
+apache-log4j1.2 (1.2.16-2) unstable; urgency=low
- * Team upload.
- * Corrected default-jdk-builddep to default-jdk and
- gcj-native-helper.
- * Updated Vcs-* fields.
-
- -- Niels Thykier <niels at thykier.net> Thu, 10 Mar 2011 19:30:47 +0100
-
-apache-log4j1.2 (1.2.16-2) experimental; urgency=low
-
- * Add --has-package-version to libapache-log4j1.2-java.poms
- * Deploy javadoc jar into the Maven repository
-
- -- Ludovic Claude <ludovic.claude at laposte.net> Mon, 04 Oct 2010 21:18:53 +0200
-
-apache-log4j1.2 (1.2.16-1) experimental; urgency=low
-
+ [ Ludovic Claude ]
* 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'
+ is 'debian' instead of '1.2.x' (Closes: #618263)
* d/control: update Homepage to reflect the new location of log4j
* include OSGi metadata in the jar, add Build-Depends on bnd
+ * Add --has-package-version to libapache-log4j1.2-java.poms
+ * Deploy javadoc jar into the Maven repository
- -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 26 Sep 2010 22:24:25 +0200
+ [ Niels Thykier ]
+ * Updated Vcs-* fields.
+ [ Torsten Werner ]
+ * Remove Kalle from Uploaders list.
+ * Do no longer build the liblog4j1.2-java-gcj package.
+ * Fix type in Description.
+
+ -- Torsten Werner <twerner at debian.org> Fri, 23 Sep 2011 23:03:09 +0200
+
jakarta-log4j (1.2.16-1) experimental; urgency=low
* New upstream release
Modified: trunk/apache-log4j1.2/debian/control
===================================================================
--- trunk/apache-log4j1.2/debian/control 2011-09-23 20:05:25 UTC (rev 15014)
+++ trunk/apache-log4j1.2/debian/control 2011-09-23 21:05:28 UTC (rev 15015)
@@ -2,8 +2,8 @@
Section: java
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>, Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, gcj-native-helper, ant, libgnujaf-java,
+Uploaders: 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>, Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, 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/
@@ -13,7 +13,7 @@
Package: liblog4j1.2-java
Architecture: all
Depends: ${misc:Depends}
-Suggests: liblog4j1.2-java-gcj, liblog4j1.2-java-doc, libgnumail-java, libjboss-jmx-java
+Suggests: 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.
@@ -27,7 +27,7 @@
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,
+ many output 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.
.
@@ -35,33 +35,6 @@
(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
Modified: trunk/apache-log4j1.2/debian/rules
===================================================================
--- trunk/apache-log4j1.2/debian/rules 2011-09-23 20:05:25 UTC (rev 15014)
+++ trunk/apache-log4j1.2/debian/rules 2011-09-23 21:05:28 UTC (rev 15015)
@@ -3,13 +3,6 @@
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
@@ -34,12 +27,8 @@
jar cvf dist/lib/log4j.javadoc.jar -C docs/api/ .
install/liblog4j1.2-java::
+ $(RM) dist/lib/log4j-*-sources.jar
mh_install
-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
More information about the pkg-java-commits
mailing list