[pkg-java] r10995 - in trunk/libxstream-java/debian: . patches

[Onkar Shinde]

Author: onkarshinde-guest
Date: 2009-11-04 18:39:05 +0000 (Wed, 04 Nov 2009)
New Revision: 10995

Added:
   trunk/libxstream-java/debian/patches/
   trunk/libxstream-java/debian/patches/01_fix_classpath.diff
   trunk/libxstream-java/debian/patches/series
Modified:
   trunk/libxstream-java/debian/changelog
   trunk/libxstream-java/debian/control
   trunk/libxstream-java/debian/rules
Log:
add classpath in manifest file

Modified: trunk/libxstream-java/debian/changelog
===================================================================
--- trunk/libxstream-java/debian/changelog	2009-11-04 16:22:24 UTC (rev 10994)
+++ trunk/libxstream-java/debian/changelog	2009-11-04 18:39:05 UTC (rev 10995)
@@ -1,3 +1,18 @@
+libxstream-java (1.3.1-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control
+    - Add quilt build dependency.
+  * debian/rules
+    - Include patchsys-quilt.mk rule.
+  * debian/patches/01_fix_classpath.diff
+    - Add appropriate jar files in classpath using manifest attribute.
+      (LP: #457660)
+  * debian/patches/series
+    - Create new and include the new patch added.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Wed, 04 Nov 2009 21:38:31 +0530
+
 libxstream-java (1.3.1-5) unstable; urgency=low
 
   * Switch to default-jdk

Modified: trunk/libxstream-java/debian/control
===================================================================
--- trunk/libxstream-java/debian/control	2009-11-04 16:22:24 UTC (rev 10994)
+++ trunk/libxstream-java/debian/control	2009-11-04 18:39:05 UTC (rev 10995)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 7), cdbs
+Build-Depends: debhelper (>= 7), cdbs, quilt
 Build-Depends-Indep: ant, default-jdk, libxom-java, libjoda-time-java,
  libjettison-java, libcglib-java, libdom4j-java, libxpp3-java,
  libjdom1-java, maven-repo-helper

Added: trunk/libxstream-java/debian/patches/01_fix_classpath.diff
===================================================================
--- trunk/libxstream-java/debian/patches/01_fix_classpath.diff	                        (rev 0)
+++ trunk/libxstream-java/debian/patches/01_fix_classpath.diff	2009-11-04 18:39:05 UTC (rev 10995)
@@ -0,0 +1,28 @@
+Index: libxstream-java-1.3.1/xstream/build.xml
+===================================================================
+--- libxstream-java-1.3.1.orig/xstream/build.xml	2009-11-04 21:39:34.000000000 +0530
++++ libxstream-java-1.3.1/xstream/build.xml	2009-11-04 21:41:56.000000000 +0530
+@@ -25,6 +25,7 @@
+     <property name="test.src.includes" value="**/*Test.java"/>
+     <property name="test.src.excludes" value="**/Abstract*"/>
+     <property name="junit.haltonfailure" value="false"/>
++    <property name="manifest.classpath" value="cglib.jar dom4j.jar jdom1.jar jettison.jar joda-time.jar xom.jar xpp3.jar xpp3-xpath.jar"/>
+ 
+     <available property="jdk1.4.available" classname="java.lang.StackTraceElement"/>
+     <available property="jdk1.5.available" classname="java.lang.Enum"/>
+@@ -144,9 +145,15 @@
+ 
+     <target name="jar" depends="compile">
+         <jar jarfile="${build.dir}/xstream-${version}.jar">
++            <manifest>
++                <attribute name="Class-Path" value="${manifest.classpath}"/>
++            </manifest>
+             <fileset dir="${java.build.dir}"/>
+         </jar>
+         <jar jarfile="${build.dir}/xstream-benchmark-${version}.jar">
++            <manifest>
++                <attribute name="Class-Path" value="${manifest.classpath}"/>
++            </manifest>
+             <fileset dir="${benchmark.build.dir}"/>
+         </jar>
+         <antcall target="jdk-check"/>

Added: trunk/libxstream-java/debian/patches/series
===================================================================
--- trunk/libxstream-java/debian/patches/series	                        (rev 0)
+++ trunk/libxstream-java/debian/patches/series	2009-11-04 18:39:05 UTC (rev 10995)
@@ -0,0 +1 @@
+01_fix_classpath.diff

Modified: trunk/libxstream-java/debian/rules
===================================================================
--- trunk/libxstream-java/debian/rules	2009-11-04 16:22:24 UTC (rev 10994)
+++ trunk/libxstream-java/debian/rules	2009-11-04 18:39:05 UTC (rev 10995)
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)