[pkg-java] r3764 - trunk/jakarta-log4j1.2/debian

Sun Jul 1 16:03:31 UTC 2007

Author: mkoch
Date: 2007-07-01 16:03:31 +0000 (Sun, 01 Jul 2007)
New Revision: 3764

Modified:
   trunk/jakarta-log4j1.2/debian/changelog
   trunk/jakarta-log4j1.2/debian/control
   trunk/jakarta-log4j1.2/debian/rules
Log:
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 <konqueror at 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 <doko at debian.org>  Fri,  8 Dec 2006 10:45:35 +0100



Modified: trunk/jakarta-log4j1.2/debian/changelog
===================================================================

--- trunk/jakarta-log4j1.2/debian/changelog	2007-07-01 12:25:12 UTC (rev 3763)
+++ trunk/jakarta-log4j1.2/debian/changelog	2007-07-01 16:03:31 UTC (rev 3764)
@@ -1,3 +1,17 @@
+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 <konqueror at 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 <doko at 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)

Modified: trunk/jakarta-log4j1.2/debian/control
===================================================================
--- trunk/jakarta-log4j1.2/debian/control	2007-07-01 12:25:12 UTC (rev 3763)
+++ trunk/jakarta-log4j1.2/debian/control	2007-07-01 16:03:31 UTC (rev 3764)
@@ -2,14 +2,15 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Kalle Kivimaa <killer at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), kaffe, libgnujaf-java, libgnumail-java
+Uploaders: Kalle Kivimaa <killer at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 4.2.30), java-gcj-compat-dev, ant, libgnujaf-java, libgnumail-java
 Standards-Version: 3.6.2
 
 Package: liblog4j1.2-java
 Architecture: all
 Section: libs
-Depends: kaffe | java1-runtime | java2-runtime
+Depends: java-common, java-gcj-compat | java1-runtime | java2-runtime
+Recommends: liblog4j1.2-java-gcj
 Suggests: libgnumail-java
 Description: Logging library for java
  log4j is a tool to help the programmer output log statements to a variety of
@@ -32,8 +33,37 @@
  (or user defined layout) like: simple text, html, date, pattern defined and
  XML.
  . 
- For more details, see <http://jakarta.apache.org/log4j>
+  Homepage: http://jakarta.apache.org/log4j
 
+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.
+ . 
+  Homepage: http://jakarta.apache.org/log4j
+
 Package: liblog4j1.2-java-doc
 Architecture: all
 Section: doc
@@ -41,3 +71,5 @@
  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.
+ . 
+  Homepage: http://jakarta.apache.org/log4j

Modified: trunk/jakarta-log4j1.2/debian/rules
===================================================================
--- trunk/jakarta-log4j1.2/debian/rules	2007-07-01 12:25:12 UTC (rev 3763)
+++ trunk/jakarta-log4j1.2/debian/rules	2007-07-01 16:03:31 UTC (rev 3764)
@@ -8,8 +8,14 @@
 VERSION=1.2.13
 JARNAME=log4j
 
-JAVA_HOME=/usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
 
+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
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -52,6 +58,10 @@
 
 	dh_movefiles --sourcedir=debian/liblog4j1.2-java
 
+ifeq ($(with_gcj_native),yes)
+	dh_nativejava -pliblog4j1.2-java-gcj
+endif
+
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.
 binary-indep: build install
@@ -69,7 +79,21 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch:
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+ifeq ($(with_gcj_native),yes)
+	dh_installdocs -a
+	dh_installchangelogs -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_strip -a
+	dh_shlibdeps -a
+	dh_installdeb -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+endif
 
-binary: binary-indep
+binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure


