Author: doko
Date: 2007-01-03 11:59:03 +0100 (Wed, 03 Jan 2007)
New Revision: 2897

Modified:
   trunk/libxerces2-java/debian/changelog
   trunk/libxerces2-java/debian/control
   trunk/libxerces2-java/debian/rules
Log:
  * Merge from Ubuntu:
    - Build architecture dependent -gcj package.
    - Move build-indep dependencies to build dependencies.
    - Add gij as alternative runtime dependency.


Modified: trunk/libxerces2-java/debian/changelog
===================================================================
--- trunk/libxerces2-java/debian/changelog      2006-12-29 12:25:51 UTC (rev 
2896)
+++ trunk/libxerces2-java/debian/changelog      2007-01-03 10:59:03 UTC (rev 
2897)
@@ -3,6 +3,12 @@
   [Arnaud Vandyck]
   * debian/watch: added
 
+  [Matthias Klose]
+  * Merge from Ubuntu:
+    - Build architecture dependent -gcj package.
+    - Move build-indep dependencies to build dependencies.
+    - Add gij as alternative runtime dependency.
+
  -- Arnaud Vandyck <[EMAIL PROTECTED]>  Mon,  6 Nov 2006 10:47:57 +0100
 
 libxerces2-java (2.8.1-1) unstable; urgency=low

Modified: trunk/libxerces2-java/debian/control
===================================================================
--- trunk/libxerces2-java/debian/control        2006-12-29 12:25:51 UTC (rev 
2896)
+++ trunk/libxerces2-java/debian/control        2007-01-03 10:59:03 UTC (rev 
2897)
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian Java Maintainers 
<[email protected]>
 Uploaders: Stefan Gybas <[EMAIL PROTECTED]>, Arnaud Vandyck <[EMAIL 
PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]>, Marcus Better <[EMAIL 
PROTECTED]>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0)
-Build-Depends-Indep: java-gcj-compat-dev, ant, 
libxml-commons-resolver1.1-java, libjaxp1.3-java
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), java-gcj-compat-dev, 
ant, libxml-commons-resolver1.1-java, libjaxp1.3-java
 Standards-Version: 3.7.2
 
 Package: libxerces2-java
 Architecture: all
 Section: libs
-Depends: classpath-common | java1-runtime | java2-runtime, libjaxp1.3-java
+Depends: gij | java-gcj-compat | java1-runtime | java2-runtime, libjaxp1.3-java
+Recommends: libxerces2-java-gcj
 Suggests: libxerces2-java-doc
 Description: Validating XML parser for Java with DOM level 3 support
  The Xerces2 Java parser is the reference implementation of XNI, the
@@ -37,3 +37,13 @@
  the DOM level 3 load/save API's are in use.
  .
   Homepage: http://xerces.apache.org/xerces2-j/
+
+Package: libxerces2-java-gcj
+Architecture: any
+Section: libs
+Depends: libxerces2-java (>= ${source:Version}), libjaxp1.2-java-gcj, 
${misc:Depends}, ${shlibs:Depends}
+Description: Validating XML parser for Java with DOM level 3 support (native 
code)
+ The Xerces2 Java parser is the reference implementation of XNI, the
+ Xerces Native Interface, and also a fully conforming XML Schema processor.
+ .
+ This package contains the natively compiled code for use by gij.

Modified: trunk/libxerces2-java/debian/rules
===================================================================
--- trunk/libxerces2-java/debian/rules  2006-12-29 12:25:51 UTC (rev 2896)
+++ trunk/libxerces2-java/debian/rules  2007-01-03 10:59:03 UTC (rev 2897)
@@ -16,7 +16,13 @@
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar
 
+install/libxerces2-java::
+       mkdir -p debian/libxerces2-java/usr/share/java
+       install -m 644 build/xercesImpl.jar 
debian/libxerces2-java/usr/share/java/
 
+install/libxerces2-java-gcj:: install/libxerces2-java
+       dh_nativejava -plibxerces2-java-gcj
+
 clean::
        rm -rf build
 


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to