[pkg-java] r3766 - trunk/libxerces2-java-doc/debian

[avdyk at alioth.debian.org]

Author: avdyk
Date: 2007-07-02 20:12:46 +0000 (Mon, 02 Jul 2007)
New Revision: 3766

Modified:
   trunk/libxerces2-java-doc/debian/changelog
   trunk/libxerces2-java-doc/debian/control
   trunk/libxerces2-java-doc/debian/rules
Log:
sync with svn repo

Modified: trunk/libxerces2-java-doc/debian/changelog
===================================================================
--- trunk/libxerces2-java-doc/debian/changelog	2007-07-01 16:03:49 UTC (rev 3765)
+++ trunk/libxerces2-java-doc/debian/changelog	2007-07-02 20:12:46 UTC (rev 3766)
@@ -1,3 +1,12 @@
+libxerces2-java-doc (2.6.1-2) unstable; urgency=low
+
+  * ant transition
+  * added myself as an uploader
+  * added the java-package directories but we don't need a java2-compiler,
+    we need to build-dep on a java2-runtime (close: #306804)
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Fri, 23 Sep 2005 13:08:09 +0200
+
 libxerces2-java-doc (2.6.1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libxerces2-java-doc/debian/control
===================================================================
--- trunk/libxerces2-java-doc/debian/control	2007-07-01 16:03:49 UTC (rev 3765)
+++ trunk/libxerces2-java-doc/debian/control	2007-07-02 20:12:46 UTC (rev 3766)
@@ -2,8 +2,8 @@
 Section: contrib/doc
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), libant1.6-java, j2re1.4, jikes (>= 1.18), libxerces-java, libxalan2-java
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), ant, j2re1.4 | java2-runtime, jikes (>= 1.18), libxerces-java, libxalan2-java
 Standards-Version: 3.6.1
 
 Package: libxerces2-java-doc

Modified: trunk/libxerces2-java-doc/debian/rules
===================================================================
--- trunk/libxerces2-java-doc/debian/rules	2007-07-01 16:03:49 UTC (rev 3765)
+++ trunk/libxerces2-java-doc/debian/rules	2007-07-02 20:12:46 UTC (rev 3766)
@@ -6,18 +6,20 @@
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed -e "s/\./_/g")
 DEB_TAR_SRCDIR   := xerces-$(UPSTREAM_VERSION)
 
+export JITC_PROCESSOR_TYPE=6
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 # Directories to look for JAVA_HOME (JDK 1.4+ required!)
-JAVA_HOME_DIRS := /usr/lib/j2se/1.4 /usr/lib/j2re1.4
-ANT_HOME       := /usr/share/ant1.6
+JAVA_HOME_DIRS := /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown /usr/local/IBMJava2-ppc-142
+ANT_HOME       := /usr/share/ant
 
 # Additional JARs to add to the class path, either full path or just the
 # basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS := $(CURDIR)/$(DEB_SRCDIR)/tools/bin/xjavac.jar /usr/share/ant1.6/lib/ant-launcher.jar
+DEB_JARS := $(CURDIR)/$(DEB_SRCDIR)/tools/bin/xjavac.jar $(ANT_HOME)/lib/ant-launcher.jar
 
 # Build compiler
 DEB_ANT_COMPILER := jikes