[pkg-java] r11062 - trunk/libxml-security-java/debian

Thierry Carrez ttx-guest at alioth.debian.org
Fri Nov 13 12:39:25 UTC 2009


Author: ttx-guest
Date: 2009-11-13 12:39:25 +0000 (Fri, 13 Nov 2009)
New Revision: 11062

Modified:
   trunk/libxml-security-java/debian/build.xml
   trunk/libxml-security-java/debian/changelog
   trunk/libxml-security-java/debian/control
Log:
* 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/

Modified: trunk/libxml-security-java/debian/build.xml
===================================================================
--- trunk/libxml-security-java/debian/build.xml	2009-11-13 12:27:20 UTC (rev 11061)
+++ trunk/libxml-security-java/debian/build.xml	2009-11-13 12:39:25 UTC (rev 11062)
@@ -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">

Modified: trunk/libxml-security-java/debian/changelog
===================================================================
--- trunk/libxml-security-java/debian/changelog	2009-11-13 12:27:20 UTC (rev 11061)
+++ trunk/libxml-security-java/debian/changelog	2009-11-13 12:39:25 UTC (rev 11062)
@@ -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.

Modified: trunk/libxml-security-java/debian/control
===================================================================
--- trunk/libxml-security-java/debian/control	2009-11-13 12:27:20 UTC (rev 11061)
+++ trunk/libxml-security-java/debian/control	2009-11-13 12:39:25 UTC (rev 11062)
@@ -12,7 +12,7 @@
 
 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




More information about the pkg-java-commits mailing list