r1856 - trunk/jakarta-log4j1.2/debian

[Wolfgang Bär]

Author: wbaer-guest
Date: 2006-02-01 20:55:23 +0000 (Wed, 01 Feb 2006)
New Revision: 1856

Modified:
   trunk/jakarta-log4j1.2/debian/README.Debian
   trunk/jakarta-log4j1.2/debian/changelog
   trunk/jakarta-log4j1.2/debian/control
   trunk/jakarta-log4j1.2/debian/liblog4j1.2-java.links
   trunk/jakarta-log4j1.2/debian/rules
Log:
kaffe transition upload + new usptream

Modified: trunk/jakarta-log4j1.2/debian/README.Debian
===================================================================
--- trunk/jakarta-log4j1.2/debian/README.Debian	2006-02-01 20:53:32 UTC (rev 1855)
+++ trunk/jakarta-log4j1.2/debian/README.Debian	2006-02-01 20:55:23 UTC (rev 1856)
@@ -65,17 +65,6 @@
 
         http://java.sun.com/products/javamail/
 
-    and the JavaBeans Activation Framework at:
+    or just apt-get install libgnumail-java in Debian :-)
 
-        http://java.sun.com/beans/glasgow/jaf.html
-
-    -----------
-    JMSAppender
-    -----------
-  
-    The JMSAppender requires the JMS API as well as JNDI. The JMS API
-    is usually bundled with the products of the vendors listed under
-
-       http://java.sun.com/products/jms/vendors.html
-
  -- Benoit Joly <benoit at kaitain.dune.local>, Sat Apr 12 18:36:10 2003

Modified: trunk/jakarta-log4j1.2/debian/changelog
===================================================================
--- trunk/jakarta-log4j1.2/debian/changelog	2006-02-01 20:53:32 UTC (rev 1855)
+++ trunk/jakarta-log4j1.2/debian/changelog	2006-02-01 20:55:23 UTC (rev 1856)
@@ -1,3 +1,13 @@
+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 <WBaer at 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)

Modified: trunk/jakarta-log4j1.2/debian/control
===================================================================
--- trunk/jakarta-log4j1.2/debian/control	2006-02-01 20:53:32 UTC (rev 1855)
+++ trunk/jakarta-log4j1.2/debian/control	2006-02-01 20:55:23 UTC (rev 1856)
@@ -3,13 +3,14 @@
 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, libcrimson-java, libjaxp1.2-java, libgnujaf-java, libgnumail-java
+Build-Depends-Indep: debhelper (>= 4.2.30), kaffe, libgnujaf-java, libgnumail-java
 Standards-Version: 3.6.2
 
 Package: liblog4j1.2-java
 Architecture: all
 Section: libs
 Depends: kaffe | java1-runtime | java2-runtime
+Suggests: libgnumail-java
 Description: Logging library for java
  log4j is a tool to help the programmer output log statements to a variety of
  output targets. 
@@ -31,7 +32,7 @@
  (or user defined layout) like: simple text, html, date, pattern defined and
  XML.
  . 
- For more details, see http://jakarta.apache.org/log4j
+ For more details, see <http://jakarta.apache.org/log4j>
 
 Package: liblog4j1.2-java-doc
 Architecture: all

Modified: trunk/jakarta-log4j1.2/debian/liblog4j1.2-java.links
===================================================================
--- trunk/jakarta-log4j1.2/debian/liblog4j1.2-java.links	2006-02-01 20:53:32 UTC (rev 1855)
+++ trunk/jakarta-log4j1.2/debian/liblog4j1.2-java.links	2006-02-01 20:55:23 UTC (rev 1856)
@@ -1 +1 @@
-usr/share/java/log4j-1.2.12.jar usr/share/java/log4j-1.2.jar
+usr/share/java/log4j-1.2.13.jar usr/share/java/log4j-1.2.jar

Modified: trunk/jakarta-log4j1.2/debian/rules
===================================================================
--- trunk/jakarta-log4j1.2/debian/rules	2006-02-01 20:53:32 UTC (rev 1855)
+++ trunk/jakarta-log4j1.2/debian/rules	2006-02-01 20:55:23 UTC (rev 1856)
@@ -5,7 +5,7 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-VERSION=1.2.12
+VERSION=1.2.13
 JARNAME=log4j
 
 JAVA_HOME=/usr/lib/kaffe
@@ -13,9 +13,8 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	rm -rf src/java/org/apache/log4j/jmx/Agent.java src/java/org/apache/log4j/jmx/T.java src/java/org/apache/log4j/or/jms src/java/org/apache/log4j/jmx src/java/org/apache/log4j/net/JMS*.java src/java/org/apache/log4j/lf5 src/java/org/apache/log4j/chainsaw
+	rm -rf src/java/org/apache/log4j/jmx src/java/org/apache/log4j/or/jms src/java/org/apache/log4j/net/JMS*.java src/java/org/apache/log4j/lf5
 	find src/java -name \*.java > list.sources
-	#(cd src/java ; find . -name \*.java | sed -e 's!./!!' -e 's!.java!!' -e 's!/!.!g' > ../../gjdoc.sources)
 	touch configure-stamp
 
 build: configure-stamp build-stamp
@@ -24,11 +23,10 @@
 
 	# Add here commands to compile the package.
 	mkdir -p dist/classes
-	$(JAVA_HOME)/bin/javac -classpath /usr/share/java/activation.jar:/usr/share/java/gnumail.jar:/usr/share/java/jaxp-1.2.jar:/usr/share/java/crimson.jar -sourcepath src/java -d dist/classes @list.sources
+	$(JAVA_HOME)/bin/javac -classpath /usr/share/java/activation.jar:/usr/share/java/gnumail.jar -sourcepath src/java -d dist/classes @list.sources
 	cp src/java/org/apache/log4j/xml/log4j.dtd dist/classes/org/apache/log4j/xml/
 	$(JAVA_HOME)/bin/jar -cf dist/lib/${JARNAME}-${VERSION}.jar -C dist/classes org
-	# gjdoc -d docs/api -sourcepath src/java `(cd src/java ; find . -type d | sed -e 's!./!!' -e 's!/!.!g' | grep org | grep -v test )`
-
+	gjdoc -d docs/api -sourcepath src/java -all
 	touch build-stamp
 
 clean:
@@ -36,6 +34,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	rm -rf dist/classes dist/lib/*
+	rm -rf docs/api
 	rm -f build.properties list.sources gjdoc.sources
 	find src -name "*.class" -exec rm {} \;
 	# Add here commands to clean up after the build process.