[pkg-java] r2765 - in trunk/nekohtml/nekohtml: debian src/html/org/cyberneko/html

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-16 10:16:54 +0100 (Thu, 16 Nov 2006)
New Revision: 2765

Modified:
   trunk/nekohtml/nekohtml/debian/changelog
   trunk/nekohtml/nekohtml/src/html/org/cyberneko/html/HTMLScanner.java
Log:
Merge debian and xerces-2.8-build-fix branches (r2764).


Modified: trunk/nekohtml/nekohtml/debian/changelog
===================================================================
--- trunk/nekohtml/nekohtml/debian/changelog	2006-11-16 09:15:41 UTC (rev 2764)
+++ trunk/nekohtml/nekohtml/debian/changelog	2006-11-16 09:16:54 UTC (rev 2765)
@@ -1,3 +1,11 @@
+nekohtml (0.9.5+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add stubs for two missing XMLLocator methods; fixes FTBFS.
+    (Closes: #397697)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Thu, 16 Nov 2006 00:02:27 +0100
+
 nekohtml (0.9.5+dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #382995)

Modified: trunk/nekohtml/nekohtml/src/html/org/cyberneko/html/HTMLScanner.java
===================================================================
--- trunk/nekohtml/nekohtml/src/html/org/cyberneko/html/HTMLScanner.java	2006-11-16 09:15:41 UTC (rev 2764)
+++ trunk/nekohtml/nekohtml/src/html/org/cyberneko/html/HTMLScanner.java	2006-11-16 09:16:54 UTC (rev 2765)
@@ -593,6 +593,16 @@
         return fCurrentEntity != null ? fCurrentEntity.columnNumber : -1; 
     } // getColumnNumber():int
 
+    /** Returns the XML version. */
+    public String getXMLVersion() { 
+        return "1.0";
+    } // getXMLVersion():String
+    
+    /** Returns the current character offset. */
+    public int getCharacterOffset() { 
+        return -1;
+    } // getCharacterOffset():int
+
     //
     // HTMLComponent methods
     //