[libxml-security-java] 08/32: * debian/build.xml: Build Java2 code to match runtime dependency * debian/build.xml: Fix the jar packaging to include resources * debian/control: Depend on JRE /and/ shlibs:Depends, rather than /or/

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libxml-security-java.

commit 48fbf7bdddcf94007a165a1dea69bc40c7d46472
Author: Thierry Carrez <thierry.carrez at ubuntu.com>
Date:   Fri Nov 13 12:39:25 2009 +0000

    * debian/build.xml: Build Java2 code to match runtime dependency
    * debian/build.xml: Fix the jar packaging to include resources
    * debian/control: Depend on JRE /and/ shlibs:Depends, rather than /or/
---
 debian/build.xml | 7 +++++--
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 24abe23..40ae2f3 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -14,7 +14,7 @@
   <target name="compile">
     <mkdir dir="${class.dir}" />
     <javac srcdir="${source.dir}" destdir="${class.dir}"
-	   debug="true" source="1.5"/>
+	   debug="true" source="1.4" target="1.4"/>
     <copy todir="${class.dir}">
       <fileset dir="${source.dir}">
         <patternset refid="compiler.resources" />
@@ -23,7 +23,10 @@
   </target>
 
   <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="${jar.name}" basedir="${class.dir}"/>
+    <jar jarfile="${jar.name}">
+      <fileset dir="${class.dir}"/>
+      <fileset dir="${source.dir}"><include name="org/apache/xml/security/resource/**"/></fileset>
+    </jar>
   </target>
 
   <target name="javadoc" description="Creates Javadoc documentation">
diff --git a/debian/changelog b/debian/changelog
index 72294b9..debd42b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libxml-security-java (1.4.3-2) UNRELEASED; urgency=low
+
+  * debian/build.xml: Build Java2 code to match runtime dependency
+  * debian/build.xml: Fix the jar packaging to include resources
+  * debian/control: Depend on JRE /and/ shlibs:Depends, rather than /or/
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Fri, 13 Nov 2009 13:31:48 +0100
+
 libxml-security-java (1.4.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 78a9a84..ec8d913 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxml-security-java
 
 Package: libxml-security-java
 Architecture: all
-Depends: default-jre-headless | java2-runtime-headless | ${shlibs:Depends}, ${misc:Depends}
+Depends: default-jre-headless | java2-runtime-headless, ${shlibs:Depends}, ${misc:Depends}
 Description: implementation of security standards for XML
  The XML Security project is aimed at providing implementation of
  security standards for XML. Currently the focus is on the W3C

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxml-security-java.git