[pkg-java] r4887 - in trunk/libradeox-java/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-11-28 21:06:38 +0000 (Wed, 28 Nov 2007)
New Revision: 4887

Added:
   trunk/libradeox-java/debian/patches/
   trunk/libradeox-java/debian/patches/series
   trunk/libradeox-java/debian/patches/upstream.diff
Modified:
   trunk/libradeox-java/debian/
   trunk/libradeox-java/debian/control
   trunk/libradeox-java/debian/rules
Log:
the package builds now



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

Modified: trunk/libradeox-java/debian/control
===================================================================
--- trunk/libradeox-java/debian/control	2007-11-28 21:02:44 UTC (rev 4886)
+++ trunk/libradeox-java/debian/control	2007-11-28 21:06:38 UTC (rev 4887)
@@ -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>
-Build-Depends: debhelper (>= 5), cdbs
+Build-Depends: debhelper (>= 5), cdbs, quilt
 Build-Depends-Indep: ant, java-gcj-compat-dev
 Standards-Version: 3.7.2
 Homepage: http://www.radeox.org

Added: trunk/libradeox-java/debian/patches/series
===================================================================
--- trunk/libradeox-java/debian/patches/series	                        (rev 0)
+++ trunk/libradeox-java/debian/patches/series	2007-11-28 21:06:38 UTC (rev 4887)
@@ -0,0 +1 @@
+upstream.diff

Added: trunk/libradeox-java/debian/patches/upstream.diff
===================================================================
--- trunk/libradeox-java/debian/patches/upstream.diff	                        (rev 0)
+++ trunk/libradeox-java/debian/patches/upstream.diff	2007-11-28 21:06:38 UTC (rev 4887)
@@ -0,0 +1,13 @@
+Index: libradeox-java-1.0~beta3/src/java/org/radeox/example/RadeoxTemplateEngine.java
+===================================================================
+--- libradeox-java-1.0~beta3.orig/src/java/org/radeox/example/RadeoxTemplateEngine.java	2007-11-28 22:09:16.000000000 +0100
++++ libradeox-java-1.0~beta3/src/java/org/radeox/example/RadeoxTemplateEngine.java	2007-11-28 22:09:32.000000000 +0100
+@@ -40,7 +40,7 @@
+  */
+ 
+ public class RadeoxTemplateEngine extends TemplateEngine {
+-   public Template createTemplate(Reader reader) throws SyntaxException, ClassNotFoundException, IOException {
++   public Template createTemplate(Reader reader) throws ClassNotFoundException, IOException {
+        RenderContext context = new BaseRenderContext();
+        RenderEngine engine = new BaseRenderEngine();
+        String renderedText = engine.render(reader , context);

Modified: trunk/libradeox-java/debian/rules
===================================================================
--- trunk/libradeox-java/debian/rules	2007-11-28 21:02:44 UTC (rev 4886)
+++ trunk/libradeox-java/debian/rules	2007-11-28 21:06:38 UTC (rev 4887)
@@ -2,8 +2,10 @@
 
 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
 
-JAVA_HOME         := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS  := picocontainer commons-logging oro groovy
 
 install/libpicocontainer-java:: 
 	install -m644 -D picocontainer.jar $(DEB_DESTDIR)/usr/share/java/picocontainer-$(DEB_UPSTREAM_VERSION).jar