[pkg-java] r6129 - in trunk/cdk/debian: . patches

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2008-04-08 22:44:17 +0000 (Tue, 08 Apr 2008)
New Revision: 6129

Added:
   trunk/cdk/debian/patches/
   trunk/cdk/debian/patches/10-MakeJavafilesFiles.patch
Modified:
   trunk/cdk/debian/changelog
   trunk/cdk/debian/control
Log:
cdk (1:1.0.2-2) UNRELEASED; urgency=low

  * Patched MakeJavafilesFiles.java so that it accepts comments of the
    form "/** ... */".
    (Closes: #474908 - FTBFS: NomParserTokenManager cannot be resolved
    to a type).

 -- Paul Cager <paul-debian at home.paulcager.org>  Tue, 08 Apr 2008 23:39:41 +0100


Modified: trunk/cdk/debian/changelog
===================================================================
--- trunk/cdk/debian/changelog	2008-04-08 18:36:13 UTC (rev 6128)
+++ trunk/cdk/debian/changelog	2008-04-08 22:44:17 UTC (rev 6129)
@@ -1,3 +1,12 @@
+cdk (1:1.0.2-2) UNRELEASED; urgency=low
+
+  * Patched MakeJavafilesFiles.java so that it accepts comments of the
+    form "/** ... */".
+    (Closes: #474908 - FTBFS: NomParserTokenManager cannot be resolved
+    to a type).
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Tue, 08 Apr 2008 23:39:41 +0100
+
 cdk (1:1.0.2-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/cdk/debian/control
===================================================================
--- trunk/cdk/debian/control	2008-04-08 18:36:13 UTC (rev 6128)
+++ trunk/cdk/debian/control	2008-04-08 22:44:17 UTC (rev 6129)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Michael Koch <konqueror at gmx.de>
+Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>
 Build-Depends: cdbs, debhelper (>= 5)
 Build-Depends-Indep: ant-optional, antlr, docbook-xsl (>= 1.66.1), javacc, java-gcj-compat-dev, libcommons-cli-java, libcrimson-java, libjdom0-java, liblog4j1.2-java, libmysql-java, libpgjava, libxerces2-java, xsltproc, libjgrapht-java, libvecmath1.2-java, libxom-java, libjama-java
 Standards-Version: 3.7.3

Added: trunk/cdk/debian/patches/10-MakeJavafilesFiles.patch
===================================================================
--- trunk/cdk/debian/patches/10-MakeJavafilesFiles.patch	                        (rev 0)
+++ trunk/cdk/debian/patches/10-MakeJavafilesFiles.patch	2008-04-08 22:44:17 UTC (rev 6129)
@@ -0,0 +1,11 @@
+--- cdk-1.0.2.orig/src/net/sf/cdk/tools/MakeJavafilesFiles.java
++++ cdk-1.0.2/src/net/sf/cdk/tools/MakeJavafilesFiles.java
+@@ -140,7 +140,7 @@
+ 				int index = line.indexOf("/**");
+ 				if (index != -1) {
+ 					inComment = true;
+-					if (line.substring(index).indexOf("**/") != -1) inComment = false;
++					if (line.substring(index).indexOf("*/") != -1) inComment = false;
+ 				} else {
+ 					if (line.indexOf("*/") != -1) inComment = false;
+ 				}