[pkg-java] r7329 - in trunk/libjboss-web-services-java/debian: . patches

twerner at alioth.debian.org twerner at alioth.debian.org
Fri Nov 14 22:57:23 UTC 2008 

Author: twerner
Date: 2008-11-14 22:57:23 +0000 (Fri, 14 Nov 2008)
New Revision: 7329

Removed:
   trunk/libjboss-web-services-java/debian/patches/jaxb.diff
Modified:
   trunk/libjboss-web-services-java/debian/build.xml
   trunk/libjboss-web-services-java/debian/changelog
   trunk/libjboss-web-services-java/debian/control
   trunk/libjboss-web-services-java/debian/orig-tar.sh
   trunk/libjboss-web-services-java/debian/patches/series
   trunk/libjboss-web-services-java/debian/rules
Log:
* Switch to openjdk-6 for building the package.
* Bump up Standards-Version: 3.8.0 (no changes).
* Do no longer build jboss-native.

Modified: trunk/libjboss-web-services-java/debian/build.xml
===================================================================
--- trunk/libjboss-web-services-java/debian/build.xml	2008-11-14 22:09:19 UTC (rev 7328)
+++ trunk/libjboss-web-services-java/debian/build.xml	2008-11-14 22:57:23 UTC (rev 7329)
@@ -32,6 +32,7 @@
       </fileset>
     </jar>
 
+    <!--
     <mkdir dir="${jbossws-native.dir}/${class.dir}"/>
     <javac srcdir="${jbossws-native.dir}/${source.dir}" destdir="${jbossws-native.dir}/${class.dir}"
 	   includes="**/javax/**" debug="true" source="1.5" 
@@ -42,6 +43,7 @@
           <include name="**"/>
       </fileset>
     </jar>
+    -->
 
   </target>
 </project>

Modified: trunk/libjboss-web-services-java/debian/changelog
===================================================================
--- trunk/libjboss-web-services-java/debian/changelog	2008-11-14 22:09:19 UTC (rev 7328)
+++ trunk/libjboss-web-services-java/debian/changelog	2008-11-14 22:57:23 UTC (rev 7329)
@@ -1,3 +1,11 @@
+libjboss-web-services-java (0.0+svn5660-3) unstable; urgency=low
+
+  * Switch to openjdk-6 for building the package.
+  * Bump up Standards-Version: 3.8.0 (no changes).
+  * Do no longer build jboss-native.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 14 Nov 2008 23:56:09 +0100
+
 libjboss-web-services-java (0.0+svn5660-2) unstable; urgency=low
 
   * debian/rules: remove jboss-dependency from DEB_JARS

Modified: trunk/libjboss-web-services-java/debian/control
===================================================================
--- trunk/libjboss-web-services-java/debian/control	2008-11-14 22:09:19 UTC (rev 7328)
+++ trunk/libjboss-web-services-java/debian/control	2008-11-14 22:57:23 UTC (rev 7329)
@@ -4,10 +4,10 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 6), quilt
-Build-Depends-Indep: ant, sun-java6-jdk, junit, libservlet2.4-java,
+Build-Depends-Indep: ant, openjdk-6-jdk, junit, libservlet2.4-java,
  libjboss-common-java, libjboss-xml-binding-java, libdom4j-java,
  libjboss-microcontainer-java, glassfish-javaee, libgetopt-java
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://labs.jboss.com/jbossws/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-web-services-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-web-services-java

Modified: trunk/libjboss-web-services-java/debian/orig-tar.sh
===================================================================
--- trunk/libjboss-web-services-java/debian/orig-tar.sh	2008-11-14 22:09:19 UTC (rev 7328)
+++ trunk/libjboss-web-services-java/debian/orig-tar.sh	2008-11-14 22:57:23 UTC (rev 7329)
@@ -1,6 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
 
-# called by uscan with '--upstream-version' <version> <file>
+set -e
+
 TAR=../libjboss-web-services-java_$1.orig.tar.gz
 DIR=libjboss-web-services-java-$1.orig
 REVISION=`echo $1 | sed -e 's/.*svn//'`

Deleted: trunk/libjboss-web-services-java/debian/patches/jaxb.diff
===================================================================
--- trunk/libjboss-web-services-java/debian/patches/jaxb.diff	2008-11-14 22:09:19 UTC (rev 7328)
+++ trunk/libjboss-web-services-java/debian/patches/jaxb.diff	2008-11-14 22:57:23 UTC (rev 7329)
@@ -1,15 +0,0 @@
-Index: libjboss-web-services-java-0.0+svn5660/jbossws-native/org/jboss/ws/core/jaxws/JAXBContextFactory.java
-===================================================================
---- libjboss-web-services-java-0.0+svn5660.orig/jbossws-native/org/jboss/ws/core/jaxws/JAXBContextFactory.java	2008-02-14 15:25:54.000000000 +0530
-+++ libjboss-web-services-java-0.0+svn5660/jbossws-native/org/jboss/ws/core/jaxws/JAXBContextFactory.java	2008-02-14 15:26:06.000000000 +0530
-@@ -27,8 +27,8 @@
- 
- import javax.xml.bind.JAXBContext;
- 
--import com.sun.xml.bind.api.TypeReference;
--import com.sun.xml.bind.api.JAXBRIContext;
-+import com.sun.xml.internal.bind.api.TypeReference;
-+import com.sun.xml.internal.bind.api.JAXBRIContext;
- 
- import java.util.Collection;
- 

Modified: trunk/libjboss-web-services-java/debian/patches/series
===================================================================
--- trunk/libjboss-web-services-java/debian/patches/series	2008-11-14 22:09:19 UTC (rev 7328)
+++ trunk/libjboss-web-services-java/debian/patches/series	2008-11-14 22:57:23 UTC (rev 7329)
@@ -1 +0,0 @@
-jaxb.diff

Modified: trunk/libjboss-web-services-java/debian/rules
===================================================================
--- trunk/libjboss-web-services-java/debian/rules	2008-11-14 22:09:19 UTC (rev 7328)
+++ trunk/libjboss-web-services-java/debian/rules	2008-11-14 22:57:23 UTC (rev 7329)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-6-sun
+JAVA_HOME 		:= /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_JARS		:= $(JAVA_HOME)/jre/lib/rt servlet-api junit dom4j gnu-getopt glassfish-ejb-api \

More information about the pkg-java-commits mailing list