Bug#605367: tomcat6 FTBFS against ant 1.8.1

2010-11-29 Thread James Page
Package: tomcat6
Version: 6.0.28-7
Severity: serious
Tags: patch
Justification: fails to build from source
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch


tomcat6 will FTBFS against ant 1.8.1.  Appreciate that this is still in 
experimental 
but at some point in time this will break.  This is due to the fact that TRaX 
is now
part of the JDK so the optional tasks in Ant have moved from ant-trax.jar to 
ant-nodeps.jar.

*** /tmp/tmpIpNIFU
In Ubuntu, we've applied the attached patch to achieve the following:

  * Amended debian/rules, fix xslt processing in ant 1.8.1 to 
fix FTBFS (LP: #662588)

We thought you might be interested in doing the same. 


-- System Information:
Debian Release: squeeze/sid
  APT prefers maverick-updates
  APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500, 
'maverick')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.35-23-generic (SMP w/8 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/rules'
--- debian/rules2010-07-20 14:36:48 +
+++ debian/rules2010-11-08 13:32:13 +
@@ -5,7 +5,7 @@
 BLDLIB := output/build/lib
 BLDBIN := output/build/bin
 DEB_JARS_BASE := /usr/share/java
-DEB_JARS := ant ant-launcher ant-trax
+DEB_JARS := ant ant-launcher ant-trax ant-nodeps
 DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
if [ -f $$jar ]; then echo -n $${jar}:; fi; \
if [ -f $$jar.jar ]; then echo -n $${jar}.jar:; fi; \

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please 
use
debian-j...@lists.debian.org for discussions and questions.


FOP Hyphenation patterns in Debian?

2010-11-29 Thread Joachim Breitner
Hi FOP maintainers,

FOP does not ship hyphenation patterns due to perceived license problems
by upstream¹. On the other hand, Debian ships at least some hyphenation
patterns in the texlive-base package, so it seems that we do not see a
problem here.

If that is the case we should ship a fop package with hyphenation
patterns included. The question is how to generate and ship them. Here
is the workflow: The sources seem to be included in the texlive source,
in the CTAN hyph-utf8 package. Their SVN includes a conversion script to
turn them into XML files². These XML files have to be compiled by FOP³.

Now the texlive-base-2009 package does not include the necessary files
(e.g. patterns/txt/hyph-af.lic.txt) to generate the XML files, so they
can not easily built within the texlive package. You could either create
a tarball from the SVN repository of the hyph-utf8 package or fetch the
generated XML files in the tarball
http://sourceforge.net/projects/offo/files/offo-hyphenation/2.0/offo-hyphenation_v2.0.zip/download
but that would go a bit against Debians policy of building anything from
the most primitive source available (although texlive-base-2009’s source
also seems to contain generated patterns).

If you want to build them together with FOP, the new multi-tarball
feature of dpkg might be handy.

Thanks,
Joachim


¹ http://xmlgraphics.apache.org/fop/1.0/hyphenation.html#license-issues
Many of the hyphenation files distributed with TeX and its offspring are
licenced under the LaTeX Project Public License (LPPL), which prevents
them from being distributed with Apache software. The LPPL puts
restrictions on file names in redistributed derived works which we feel
can't guarantee. Some hyphenation pattern files have other or additional
restrictions, for example against use for commercial purposes. 

² http://tug.org/svn/texhyphen/trunk/collaboration/source/offo/

³ 
http://offo.sourceforge.net/hyphenation/installation.html#Installation+of+FOP+XML+Hyphenation+Patterns
-- 
Joachim nomeata Breitner
Debian Developer
  nome...@debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
  JID: nome...@joachim-breitner.de | http://people.debian.org/~nomeata


signature.asc
Description: This is a digitally signed message part
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please 
use
debian-j...@lists.debian.org for discussions and questions.


Bug#605389: libxerces2-java: fails to XInclude when element xpointer refers to xml:id

2010-11-29 Thread brian m. carlson
Package: libxerces2-java
Version: 2.9.1-4.1
Severity: normal

Xerces supports XInclude with the element XPointer, which refers to
an ID.  However, while this works fine with ID attributes that are
defined in a DTD, it does not work if the IDs are declared using xml:id.
This makes the element syntax useless for including documents that do
not contain a DOCTYPE declaration, which includes many useful XML
formats (e.g. XHTML5).

It would be nice if Xerces would support this.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libxerces2-java depends on:
ii  default-jre-headless [java2- 1:1.6-40Standard Java or Java compatible R
ii  gcj-4.4-jre-headless [java2- 4.4.5-2 Java runtime environment using GIJ
ii  gcj-4.5-jre-headless [java2- 4.5.0-10Java runtime environment using GIJ
ii  gcj-jre-headless [java2-runt 4:4.4.5-1   Java runtime environment using GIJ
ii  libjaxp1.3-java  1.3.05-1Java XML parser and transformer AP
ii  openjdk-6-jre-headless [java 6b20~pre1-2 OpenJDK Java runtime, using Hotspo

Versions of packages libxerces2-java recommends:
pn  libxerces2-java-gcj   none (no description available)

Versions of packages libxerces2-java suggests:
pn  libxerces2-java-doc   none (no description available)

-- no debconf information

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187


signature.asc
Description: Digital signature
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please 
use
debian-j...@lists.debian.org for discussions and questions.


Bug#605389: libxerces2-java: fails to XInclude when element xpointer refers to xml:id

2010-11-29 Thread tony mancill
On 11/29/2010 07:05 AM, brian m. carlson wrote:
 Package: libxerces2-java
 Version: 2.9.1-4.1
 Severity: normal
 
 Xerces supports XInclude with the element XPointer, which refers to
 an ID.  However, while this works fine with ID attributes that are
 defined in a DTD, it does not work if the IDs are declared using xml:id.
 This makes the element syntax useless for including documents that do
 not contain a DOCTYPE declaration, which includes many useful XML
 formats (e.g. XHTML5).
 
 It would be nice if Xerces would support this.

Hi Brian,

Can you confirm that your issue is the same one reported upstream here:

  https://issues.apache.org/jira/browse/XERCESJ-1113

It looks similar; unfortunately upstream has passed on this for 4 years now...

Thank you,
Tony



signature.asc
Description: OpenPGP digital signature
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please 
use
debian-j...@lists.debian.org for discussions and questions.


[pkg-java] r13118 - in trunk/checkstyle/debian: . patches source wrappers

2010-11-29 Thread Miguel Landaeta
Author: nomadium-guest
Date: 2010-11-29 19:35:45 + (Mon, 29 Nov 2010)
New Revision: 13118

Added:
   trunk/checkstyle/debian/checkstyle.pod
   trunk/checkstyle/debian/checkstyle.poms
   trunk/checkstyle/debian/classpath
   trunk/checkstyle/debian/clean
   trunk/checkstyle/debian/examples
   trunk/checkstyle/debian/javadoc
   trunk/checkstyle/debian/manpages
   trunk/checkstyle/debian/maven.ignoreRules
   trunk/checkstyle/debian/maven.rules
   trunk/checkstyle/debian/patches/01_javadoc.diff
   trunk/checkstyle/debian/patches/series
   trunk/checkstyle/debian/source/
   trunk/checkstyle/debian/source/format
Removed:
   trunk/checkstyle/debian/Native2Ascii.java
   trunk/checkstyle/debian/ant.properties
   trunk/checkstyle/debian/dirs
   trunk/checkstyle/debian/patches/30-omit-mega-jar.patch
   trunk/checkstyle/debian/patches/35-native-to-ascii.patch
Modified:
   trunk/checkstyle/debian/changelog
   trunk/checkstyle/debian/compat
   trunk/checkstyle/debian/control
   trunk/checkstyle/debian/docs
   trunk/checkstyle/debian/install
   trunk/checkstyle/debian/rules
   trunk/checkstyle/debian/watch
   trunk/checkstyle/debian/wrappers/checkstyle
Log:
* Team upload.
* New upstream release. (Closes: #554610).
* Switch build system from Ant to Maven + Javahelper.
* Rework Build-Depends and Depends.
* Bump Standards-Version to 3.9.1. No changes were required.
* Bump debhelper compatibility level to 7.
* Set debian package source format to 3.0 (quilt).
* Add dependencies to classpath. (Closes: #557673).
* Update watch file.
* Add manpage.
* Rework patches.


Deleted: trunk/checkstyle/debian/Native2Ascii.java
===
--- trunk/checkstyle/debian/Native2Ascii.java   2010-11-28 03:42:49 UTC (rev 
13117)
+++ trunk/checkstyle/debian/Native2Ascii.java   2010-11-29 19:35:45 UTC (rev 
13118)
@@ -1,333 +0,0 @@
-/*
- * Copyright  2000-2005 The Apache Software Foundation
- * Copyright  2007 Paul Cager
- *
- *  Licensed under the Apache License, Version 2.0 (the License);
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an AS IS BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- * This file is derived from the Ant class 
org/apache/tools/ant/taskdefs/optional/Native2Ascii.java.
- * It provides the native2ascii task for GIJ (the standard ant task only works 
with SUN and
- * Kaffe JREs).
- */
-
-package org.debian.checkstyle;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.InputStreamReader;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import 
org.apache.tools.ant.taskdefs.optional.native2ascii.Native2AsciiAdapterFactory;
-import org.apache.tools.ant.types.Mapper;
-import org.apache.tools.ant.util.FileNameMapper;
-import org.apache.tools.ant.util.IdentityMapper;
-import org.apache.tools.ant.util.SourceFileScanner;
-import org.apache.tools.ant.util.facade.FacadeTaskHelper;
-import org.apache.tools.ant.util.facade.ImplementationSpecificArgument;
-
-
-/**
- * Converts files from native encodings to ASCII.
- *
- * @since Ant 1.2
- */
-public class Native2Ascii extends MatchingTask {
-
-private boolean reverse = false;  // convert from ascii back to native
-private String encoding = null;   // encoding to convert to/from
-private File srcDir = null;   // Where to find input files
-private File destDir = null;  // Where to put output files
-private String extension = null;  // Extension of output files if different
-
-private Mapper mapper;
-
-public Native2Ascii() {
-}
-
-/**
- * Flag the conversion to run in the reverse sense,
- * that is Ascii to Native encoding.
- *
- * @param reverse True if the conversion is to be reversed,
- *otherwise false;
- */
-public void setReverse(boolean reverse) {
-this.reverse = reverse;
-}
-
-/**
- * The value of the reverse attribute.
- *
- * @since Ant 1.6.3
- */
-public boolean getReverse() {
-return reverse;
-}
-
-/**
- * Set the encoding to translate to/from.
- * If unset, the default encoding for the JVM is used.
- *
- * @param encoding String containing the name of the Native
- * encoding to convert from or to.
- */
-public void setEncoding(String encoding) {
-this.encoding = encoding;
-}
-
-

Processed: Patch for 605389

2010-11-29 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 tags 605389 + patch
Bug #605389 [libxerces2-java] libxerces2-java: fails to XInclude when element 
xpointer refers to xml:id
Added tag(s) patch.
 kthxbye
Stopping processing here.

Please contact me if you need assistance.
-- 
605389: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605389
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please 
use
debian-j...@lists.debian.org for discussions and questions.


Bug#605389: Patch for 605389

2010-11-29 Thread brian m. carlson
tags 605389 + patch
kthxbye

Attached is a patch to implement the required behavior to support
xml:id.

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
diff -ur libxerces2-java.old/src/org/apache/xerces/xpointer/ShortHandPointer.java libxerces2-java-2.9.1/src/org/apache/xerces/xpointer/ShortHandPointer.java
--- libxerces2-java.old/src/org/apache/xerces/xpointer/ShortHandPointer.java	2010-11-29 15:15:28.0 +
+++ libxerces2-java-2.9.1/src/org/apache/xerces/xpointer/ShortHandPointer.java	2010-11-29 19:35:10.0 +
@@ -159,7 +159,12 @@
 if (normalizedValue != null) {
 break;
 }
-// 4. No externally determined ID's
+
+// 4. No externally determined ID's, so use xml:id if it exists.
+normalizedValue = getXMLID(attributes, i);
+if (normalizedValue != null) {
+break;
+}
 }
 }
 
@@ -187,6 +192,23 @@
 }
 return null;
 }
+
+/**
+ * Returns the value of xml:id
+ * 
+ * @param attributes
+ * @param index
+ * @return String 
+ * @throws XNIException
+ */
+public String getXMLID(XMLAttributes attributes, int index)
+throws XNIException {
+
+if (attributes.getQName(index).equals(xml:id)) {
+return attributes.getValue(index);
+}
+return null;
+}
 
 /**
  * Returns the schema-determined-ID.
@@ -291,4 +313,4 @@
 public void setSchemeData(String schemeData) {
 // NA
 }
-}
\ No newline at end of file
+}


signature.asc
Description: Digital signature
__
This is the maintainer address of Debian's Java team
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers. Please 
use
debian-j...@lists.debian.org for discussions and questions.


[pkg-java] r13119 - tags

2010-11-29 Thread Andrew Ross
Author: rockclimb-guest
Date: 2010-11-29 22:40:56 + (Mon, 29 Nov 2010)
New Revision: 13119

Added:
   tags/libspark-java/
Log:
[svn-inject] Creating libspark-java/ directory.


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13120 - trunk

2010-11-29 Thread Andrew Ross
Author: rockclimb-guest
Date: 2010-11-29 22:41:00 + (Mon, 29 Nov 2010)
New Revision: 13120

Added:
   trunk/libspark-java/
Log:
Creating trunk directory


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13121 - in trunk/libspark-java: . debian debian/patches debian/source

2010-11-29 Thread Andrew Ross
Author: rockclimb-guest
Date: 2010-11-29 22:41:03 + (Mon, 29 Nov 2010)
New Revision: 13121

Added:
   trunk/libspark-java/debian/
   trunk/libspark-java/debian/changelog
   trunk/libspark-java/debian/compat
   trunk/libspark-java/debian/control
   trunk/libspark-java/debian/copyright
   trunk/libspark-java/debian/libspark-java-doc.javadoc
   trunk/libspark-java/debian/libspark-java.jlibs
   trunk/libspark-java/debian/orig-tar.sh
   trunk/libspark-java/debian/patches/
   trunk/libspark-java/debian/patches/build-xml.patch
   trunk/libspark-java/debian/patches/javadoc.patch
   trunk/libspark-java/debian/patches/series
   trunk/libspark-java/debian/rules
   trunk/libspark-java/debian/source/
   trunk/libspark-java/debian/source/format
   trunk/libspark-java/debian/watch
Log:
[svn-inject] Applying Debian modifications (1.2-1) to trunk


Property changes on: trunk/libspark-java/debian
___
Added: mergeWithUpstream
   + 1

Added: trunk/libspark-java/debian/changelog
===
--- trunk/libspark-java/debian/changelog(rev 0)
+++ trunk/libspark-java/debian/changelog2010-11-29 22:41:03 UTC (rev 
13121)
@@ -0,0 +1,5 @@
+libspark-java (1.2-1) unstable; urgency=low
+
+  * Initial release of libspark-java package. (Closes #?).
+
+ -- Andrew Ross ubu...@rossfamily.co.uk  Mon, 29 Nov 2010 19:42:14 +

Added: trunk/libspark-java/debian/compat
===
--- trunk/libspark-java/debian/compat   (rev 0)
+++ trunk/libspark-java/debian/compat   2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1 @@
+7

Added: trunk/libspark-java/debian/control
===
--- trunk/libspark-java/debian/control  (rev 0)
+++ trunk/libspark-java/debian/control  2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,29 @@
+Source: libspark-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
+Uploaders: Andrew Ross ubu...@rossfamily.co.uk
+Build-Depends: debhelper (= 7), javahelper (=0.25) 
+Build-Depends-Indep: default-jdk, default-jdk-doc, ant
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspark-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspark-java/
+Homepage: http://www.representqueens.com/spark/
+
+Package: libspark-java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: TODO
+ TODO
+
+Package: libspark-java-doc
+Section: doc
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: TODO
+ TODO
+ .
+ This package contains the documentation.
+

Added: trunk/libspark-java/debian/copyright
===
--- trunk/libspark-java/debian/copyright(rev 0)
+++ trunk/libspark-java/debian/copyright2010-11-29 22:41:03 UTC (rev 
13121)
@@ -0,0 +1,30 @@
+This work was packaged for Debian by:
+
+Andrew Ross ubu...@rossfamily.co.uk on Mon, 29 Nov 2010 19:42:14 +
+
+It was downloaded from http://www.representqueens.com/spark/
+
+Upstream Author(s):
+Larry Ogrodnek ogrod...@gmail.com
+
+Copyright:
+
+Copyright 2006 Larry Ogrodnek
+
+License:
+
+ Apache License
+  Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+The full text of the license can be found at
+'/usr/share/common-licenses/Apache-2.0'.
+
+
+The Debian packaging is:
+
+Copyright (C) 2010 Andrew Ross ubu...@rossfamily.co.uk
+
+and is licensed under the GPL version 3, 
+see `/usr/share/common-licenses/GPL-3'.
+

Added: trunk/libspark-java/debian/libspark-java-doc.javadoc
===
--- trunk/libspark-java/debian/libspark-java-doc.javadoc
(rev 0)
+++ trunk/libspark-java/debian/libspark-java-doc.javadoc2010-11-29 
22:41:03 UTC (rev 13121)
@@ -0,0 +1 @@
+javadoc /usr/share/doc/libspark-java/api

Added: trunk/libspark-java/debian/libspark-java.jlibs
===
--- trunk/libspark-java/debian/libspark-java.jlibs  
(rev 0)
+++ trunk/libspark-java/debian/libspark-java.jlibs  2010-11-29 22:41:03 UTC 
(rev 13121)
@@ -0,0 +1 @@
+build/spark.jar

Added: trunk/libspark-java/debian/orig-tar.sh
===
--- trunk/libspark-java/debian/orig-tar.sh  (rev 0)
+++ trunk/libspark-java/debian/orig-tar.sh  2010-11-29 22:41:03 UTC (rev 
13121)
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+VERSION=$2
+FILE=$3
+
+# Resolve symbolic links
+FILE=`readlink -f $FILE`
+

[pkg-java] r13122 - trunk/libspark-java/debian

2010-11-29 Thread Andrew Ross
Author: rockclimb-guest
Date: 2010-11-29 22:53:11 + (Mon, 29 Nov 2010)
New Revision: 13122

Added:
   trunk/libspark-java/debian/README.Debian-source
Modified:
   trunk/libspark-java/debian/control
Log:
Updated


Added: trunk/libspark-java/debian/README.Debian-source
===
--- trunk/libspark-java/debian/README.Debian-source 
(rev 0)
+++ trunk/libspark-java/debian/README.Debian-source 2010-11-29 22:53:11 UTC 
(rev 13122)
@@ -0,0 +1,2 @@
+Source tarball is modified from upstream to remove all files of 
+the form */._*. 

Modified: trunk/libspark-java/debian/control
===
--- trunk/libspark-java/debian/control  2010-11-29 22:41:03 UTC (rev 13121)
+++ trunk/libspark-java/debian/control  2010-11-29 22:53:11 UTC (rev 13122)
@@ -14,16 +14,20 @@
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
-Description: TODO
- TODO
+Description: Java package to draw sparklines
+ Sparklines are intense, simple, wordlike graphics. They can 
+ be used to convey information in line graph or barchart form 
+ within a paragraph.
 
 Package: libspark-java-doc
 Section: doc
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
-Description: TODO
- TODO
+Description: Java package to draw sparklines
+ Sparklines are intense, simple, wordlike graphics. They can 
+ be used to convey information in line graph or barchart form 
+ within a paragraph.
  .
  This package contains the documentation.
 


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13123 - trunk/libspark-java/debian

2010-11-29 Thread Andrew Ross
Author: rockclimb-guest
Date: 2010-11-29 23:01:10 + (Mon, 29 Nov 2010)
New Revision: 13123

Modified:
   trunk/libspark-java/debian/control
   trunk/libspark-java/debian/rules
Log:
updated


Modified: trunk/libspark-java/debian/control
===
--- trunk/libspark-java/debian/control  2010-11-29 22:53:11 UTC (rev 13122)
+++ trunk/libspark-java/debian/control  2010-11-29 23:01:10 UTC (rev 13123)
@@ -4,7 +4,8 @@
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Andrew Ross ubu...@rossfamily.co.uk
 Build-Depends: debhelper (= 7), javahelper (=0.25) 
-Build-Depends-Indep: default-jdk, default-jdk-doc, ant
+Build-Depends-Indep: default-jdk, default-jdk-doc, ant, 
+ libservlet2.4-java
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspark-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspark-java/
@@ -13,7 +14,7 @@
 Package: libspark-java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
+Recommends: ${java:Recommends}, libservlet2.4-java
 Description: Java package to draw sparklines
  Sparklines are intense, simple, wordlike graphics. They can 
  be used to convey information in line graph or barchart form 

Modified: trunk/libspark-java/debian/rules
===
--- trunk/libspark-java/debian/rules2010-11-29 22:53:11 UTC (rev 13122)
+++ trunk/libspark-java/debian/rules2010-11-29 23:01:10 UTC (rev 13123)
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 JAVA_HOME := /usr/lib/jvm/default-java
-export CLASSPATH := 
/usr/share/java/servlet-api-2.5.jar:/usr/share/java/jsp-api.jar
+export CLASSPATH := /usr/share/java/servlet-api.jar:/usr/share/java/jsp-api.jar
 
 %:
dh $@ --with javahelper


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits


[pkg-java] r13124 - in trunk/libspark-java/debian: . patches

2010-11-29 Thread Andrew Ross
Author: rockclimb-guest
Date: 2010-11-29 23:07:52 + (Mon, 29 Nov 2010)
New Revision: 13124

Modified:
   trunk/libspark-java/debian/control
   trunk/libspark-java/debian/patches/build-xml.patch
   trunk/libspark-java/debian/patches/javadoc.patch
Log:
Update


Modified: trunk/libspark-java/debian/control
===
--- trunk/libspark-java/debian/control  2010-11-29 23:01:10 UTC (rev 13123)
+++ trunk/libspark-java/debian/control  2010-11-29 23:07:52 UTC (rev 13124)
@@ -25,7 +25,7 @@
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
-Description: Java package to draw sparklines
+Description: Java package to draw sparklines (documentation)
  Sparklines are intense, simple, wordlike graphics. They can 
  be used to convey information in line graph or barchart form 
  within a paragraph.

Modified: trunk/libspark-java/debian/patches/build-xml.patch
===
--- trunk/libspark-java/debian/patches/build-xml.patch  2010-11-29 23:01:10 UTC 
(rev 13123)
+++ trunk/libspark-java/debian/patches/build-xml.patch  2010-11-29 23:07:52 UTC 
(rev 13124)
@@ -1,3 +1,5 @@
+Remove the filesets relating to dependencies. We handle those with 
+the CLASSPATH environment variable.
 Index: spark/build.xml
 ===
 --- spark.orig/build.xml   2010-11-29 22:12:50.540491256 +

Modified: trunk/libspark-java/debian/patches/javadoc.patch
===
--- trunk/libspark-java/debian/patches/javadoc.patch2010-11-29 23:01:10 UTC 
(rev 13123)
+++ trunk/libspark-java/debian/patches/javadoc.patch2010-11-29 23:07:52 UTC 
(rev 13124)
@@ -1,3 +1,4 @@
+Build the javadoc along with the main build.
 Index: spark/build.xml
 ===
 --- spark.orig/build.xml   2010-11-29 22:21:38.272168006 +


___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits