[pkg-java] r5216 - in trunk/libwoodstox-java: . debian debian/patches

fourmond at alioth.debian.org fourmond at alioth.debian.org
Sat Dec 29 14:06:53 UTC 2007


Author: fourmond
Date: 2007-12-29 14:06:53 +0000 (Sat, 29 Dec 2007)
New Revision: 5216

Added:
   trunk/libwoodstox-java/debian/
   trunk/libwoodstox-java/debian/README.Debian
   trunk/libwoodstox-java/debian/changelog
   trunk/libwoodstox-java/debian/compat
   trunk/libwoodstox-java/debian/control
   trunk/libwoodstox-java/debian/copyright
   trunk/libwoodstox-java/debian/dirs
   trunk/libwoodstox-java/debian/docs
   trunk/libwoodstox-java/debian/install
   trunk/libwoodstox-java/debian/links
   trunk/libwoodstox-java/debian/patches/
   trunk/libwoodstox-java/debian/patches/00list
   trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
   trunk/libwoodstox-java/debian/rules
   trunk/libwoodstox-java/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: trunk/libwoodstox-java/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: trunk/libwoodstox-java/debian/README.Debian
===================================================================
--- trunk/libwoodstox-java/debian/README.Debian	                        (rev 0)
+++ trunk/libwoodstox-java/debian/README.Debian	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1,10 @@
+libwoodstox-java for Debian
+---------------------------
+
+Please note that this package doesn't provide the full functionality of the
+original sources. It has been tailored for freecol's needs, and in
+particular, features that require external dependencies were stripped
+out. Please file a bug report if you wish to use some of these features.
+
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 30 Sep 2007 15:34:41 +0200

Added: trunk/libwoodstox-java/debian/changelog
===================================================================
--- trunk/libwoodstox-java/debian/changelog	                        (rev 0)
+++ trunk/libwoodstox-java/debian/changelog	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1,16 @@
+libwoodstox-java (4.0~svn20070930-2) unstable; urgency=low
+
+  * Added a watchfile and a Homepage control field
+  * Adapted depends and bulid-depends for the (distant) future switch to
+    icedtea in Debian -- and for Ubuntu now.
+  * Dropped (build-)deps on java5, as it does not build anyway.
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 29 Nov 2007 20:39:32 +0100
+
+libwoodstox-java (4.0~svn20070930-1) unstable; urgency=low
+
+  * Initial release (funnily enough, the ITP hasn't been taken into account
+    by the BTS...)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 30 Sep 2007 23:28:12 +0200
+

Added: trunk/libwoodstox-java/debian/compat
===================================================================
--- trunk/libwoodstox-java/debian/compat	                        (rev 0)
+++ trunk/libwoodstox-java/debian/compat	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1 @@
+5

Added: trunk/libwoodstox-java/debian/control
===================================================================
--- trunk/libwoodstox-java/debian/control	                        (rev 0)
+++ trunk/libwoodstox-java/debian/control	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1,23 @@
+Source: libwoodstox-java
+Section: contrib/libs
+Priority: optional
+Maintainer: Vincent Fourmond <fourmond at debian.org>
+Build-Depends-Indep: fastjar, ant, ant-optional, 
+  icedtea-java7-jdk | sun-java6-jdk 
+Build-Depends: cdbs, debhelper (>= 5), dpatch
+Standards-Version: 3.7.2
+Homepage: http://woodstox.codehaus.org/
+
+Package: libwoodstox-java
+Architecture: all
+Depends: icedtea-java7-jre | sun-java6-jre 
+Suggests: java-virtual-machine
+Description: a high-performance XML processor
+ Woodstox is a high-performance validating namespace-aware
+ StAX-compliant (JSR-173) Open Source XML-processor written in
+ Java. XML processor means that it handles both input (parsing) and
+ output (writing, serialization), as well as supporting tasks such
+ as validation. 
+ .
+ This library is needed for the freecol package, and will probably be
+ of interest for others.

Added: trunk/libwoodstox-java/debian/copyright
===================================================================
--- trunk/libwoodstox-java/debian/copyright	                        (rev 0)
+++ trunk/libwoodstox-java/debian/copyright	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1,41 @@
+This package was debianized by Vincent Fourmond <fourmond at debian.org> on
+Sun, 30 Sep 2007 15:34:41 +0200.
+
+It was downloaded from the SVN repository
+http://svn.codehaus.org/woodstox/wstx/trunk/, on September 30th,
+2007. Additionally, the subdirectory lib was removed as it seems to
+contain several binary-only JAR files which do not seem necessary.
+
+Upstream Author: 
+  
+  Tatu Saloranta, <tatu.saloranta at iki.fi>
+
+Copyright: 
+
+  Copyright (C) 2004-2007 Tatu Saloranta
+
+  See the CREDITS file for other that have credits for this work
+  (though not copyright holders).
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+The Debian packaging is (C) 2007, Vincent Fourmond <fourmond at debian.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+

Added: trunk/libwoodstox-java/debian/dirs
===================================================================
--- trunk/libwoodstox-java/debian/dirs	                        (rev 0)
+++ trunk/libwoodstox-java/debian/dirs	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin

Added: trunk/libwoodstox-java/debian/docs
===================================================================
--- trunk/libwoodstox-java/debian/docs	                        (rev 0)
+++ trunk/libwoodstox-java/debian/docs	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1,12 @@
+release-notes/COMPATIBILITY  
+release-notes/README
+release-notes/TODO.perf
+release-notes/CREDITS
+release-notes/STAX2.txt
+release-notes/USAGE
+release-notes/FAAQ
+release-notes/stax-compatibility.txt
+release-notes/VERSION
+release-notes/PERF
+release-notes/TODO-4.0
+release-notes/xml-compatibility.txt

Added: trunk/libwoodstox-java/debian/install
===================================================================
--- trunk/libwoodstox-java/debian/install	                        (rev 0)
+++ trunk/libwoodstox-java/debian/install	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1 @@
+build/wstx-lgpl-4.0pr1.jar usr/share/java
\ No newline at end of file

Added: trunk/libwoodstox-java/debian/links
===================================================================
--- trunk/libwoodstox-java/debian/links	                        (rev 0)
+++ trunk/libwoodstox-java/debian/links	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1 @@
+usr/share/java/wstx-lgpl-4.0pr1.jar  usr/share/java/wstx-lgpl.jar
\ No newline at end of file

Added: trunk/libwoodstox-java/debian/patches/00list
===================================================================
--- trunk/libwoodstox-java/debian/patches/00list	                        (rev 0)
+++ trunk/libwoodstox-java/debian/patches/00list	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1 @@
+10-disable-unused
\ No newline at end of file

Added: trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
===================================================================
--- trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch	                        (rev 0)
+++ trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1,102 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-disable-unused.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libwoodstox-java-4.0~svn20070930~/build.xml libwoodstox-java-4.0~svn20070930/build.xml
+--- libwoodstox-java-4.0~svn20070930~/build.xml	2007-09-17 07:30:53.000000000 +0200
++++ libwoodstox-java-4.0~svn20070930/build.xml	2007-09-30 21:31:01.000000000 +0200
+@@ -20,11 +20,11 @@
+     <property name="RelNotesDir" location="${basedir}/release-notes" />
+ 
+     <!-- Libs -->
+-    <property name="LibDir" location="${basedir}/lib" />
++    <property name="LibDir" location="${basedir}/lib" /> 
+     <!-- Build-related -->
+     <property name="BuildDir" location="${basedir}/build" />
+     <property name="BuildClassesDir" location="${BuildDir}/classes" />
+-    <property name="EmmaBuildClassesDir" location="${BuildDir}/emma-classes" />
++<!--     <property name="EmmaBuildClassesDir" location="${BuildDir}/emma-classes" /> -->
+ 
+     <!-- Documentation -->
+     <property name="DocDir" location="${basedir}/doc" />
+@@ -56,10 +56,10 @@
+ 
+     <!-- jars needed for compilation -->
+     <path id="compile-classpath">
+-        <fileset dir="${LibDir}" includes="stax-api*.jar" />
+-        <fileset dir="${LibDir}" includes="sax2.jar" />
++<!--         <fileset dir="${LibDir}" includes="stax-api*.jar" /> -->
++<!--         <fileset dir="${LibDir}" includes="sax2.jar" /> -->
+         <!-- these are needed for optional MSV-based validators -->
+-        <fileset dir="${LibDir}/msv" includes="*.jar" />
++<!--         <fileset dir="${LibDir}/msv" includes="*.jar" /> -->
+     </path>
+     <path id="junit-libs">
+        <fileset dir="${LibDir}">
+@@ -96,6 +96,7 @@
+     <!-- Core Woodstox class files common to all license flavours: -->
+     <patternset id="wstx-dist-class-files">
+         <include name="com/ctc/**/*.class" />
++	<exclude name="com/ctc/**/msv/*.class" />
+         <include name="META-INF/services/javax.xml.stream.*" />
+         <include name="META-INF/services/org.codehaus.stax2.*" />
+     </patternset>
+@@ -127,21 +128,21 @@
+     <!-- Enabling support for Emma (http://emma.sourceforge.net) code
+        - coverage library
+       -->
+-    <property name="emma.dir" value="${LibDir}" />
+-    <property name="emma.coverage.dir" value="${BuildDir}/coverage" />
+-    <path id="emma.lib">
+-      <pathelement location="${emma.dir}/emma.jar" />
+-      <pathelement location="${emma.dir}/emma_ant.jar" />
+-    </path>
+-    <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
++<!--     <property name="emma.dir" value="${LibDir}" /> -->
++<!--     <property name="emma.coverage.dir" value="${BuildDir}/coverage" /> -->
++<!--     <path id="emma.lib"> -->
++<!--       <pathelement location="${emma.dir}/emma.jar" /> -->
++<!--       <pathelement location="${emma.dir}/emma_ant.jar" /> -->
++<!--     </path> -->
++<!--     <taskdef resource="emma_ant.properties" classpathref="emma.lib" /> -->
+ 
+ 
+-    <!-- And/or support for Cobertura code coverage tool -->
+-    <property name="cobertura.coverage.dir" value="${BuildDir}/coverage" />
+-    <path id="cobertura.lib">
+-      <fileset dir="${LibDir}/cobertura" includes="*.jar" />
+-    </path>
+-    <taskdef classpathref="cobertura.lib" resource="tasks.properties" />
++<!-- And/or support for Cobertura code coverage tool -->
++<!--     <property name="cobertura.coverage.dir" value="${BuildDir}/coverage" /> -->
++<!--     <path id="cobertura.lib"> -->
++<!--       <fileset dir="${LibDir}/cobertura" includes="*.jar" /> -->
++<!--     </path> -->
++<!--     <taskdef classpathref="cobertura.lib" resource="tasks.properties" /> -->
+ 
+     <!--*********************************************************************-->
+     <!-- The readme target shows a brief description of all targets          -->
+@@ -175,9 +176,9 @@
+         <!-- make build directories -->
+         <mkdir dir="${BuildDir}" />
+         <mkdir dir="${BuildClassesDir}" />
+-        <mkdir dir="${EmmaBuildClassesDir}" />
+-        <mkdir dir="${emma.coverage.dir}" />
+-        <mkdir dir="${cobertura.coverage.dir}" />
++<!--         <mkdir dir="${EmmaBuildClassesDir}" /> -->
++<!--         <mkdir dir="${emma.coverage.dir}" /> -->
++<!--         <mkdir dir="${cobertura.coverage.dir}" /> -->
+ 
+         <!-- make docs directories -->
+         <mkdir dir="${DocDir}" />
+@@ -244,6 +245,7 @@
+ -->
+             <include name="org/codehaus/stax2/**/*.java" />
+             <include name="com/ctc/**/*.java" />
++            <exclude name="com/ctc/**/msv/*.java" />
+             <include name="test/**/*.java" />
+             <classpath refid="compile-classpath" />
+         </javac>


Property changes on: trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/libwoodstox-java/debian/rules
===================================================================
--- trunk/libwoodstox-java/debian/rules	                        (rev 0)
+++ trunk/libwoodstox-java/debian/rules	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+
+# We do it by hand, as I can't get the ant.mk stuff to work for now...
+JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-6-sun/lib ] && echo "/usr/lib/jvm/java-6-sun"), /usr/lib/jvm/java-7-icedtea)
+
+JAR_LIST = /usr/share/ant/lib/ant-nodeps.jar
+clean::
+	-rm -Rf build doc test dist
+
+build:  jar
+
+jar:
+	OPT_JAR_LIST="$(JAR_LIST)" JAVA_HOME=$(JAVA_HOME) \
+	ant jar.wstx.lgpl
+
+
+# Add here any variable or target overrides you need.


Property changes on: trunk/libwoodstox-java/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/libwoodstox-java/debian/watch
===================================================================
--- trunk/libwoodstox-java/debian/watch	                        (rev 0)
+++ trunk/libwoodstox-java/debian/watch	2007-12-29 14:06:53 UTC (rev 5216)
@@ -0,0 +1,3 @@
+# The watchfile for libwoodstox
+version=3
+http://woodstox.codehaus.org/Download (?:.*)/wstx-src-(.*).tar.gz




More information about the pkg-java-commits mailing list