[nekohtml] 19/46: Merge debian and xerces-2.8-build-fix branches (r2764).

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository nekohtml.

commit 1727bae033d3c7bac258d80f4b0f25ceaebc10f9
Author: Marcus Better <marcus at better.se>
Date:   Thu Nov 16 09:16:54 2006 +0000

    Merge debian and xerces-2.8-build-fix branches (r2764).
---
 nekohtml/debian/changelog                             |  8 ++++++++
 nekohtml/src/html/org/cyberneko/html/HTMLScanner.java | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/nekohtml/debian/changelog b/nekohtml/debian/changelog
index 1a1fcc1..16c06f3 100644
--- a/nekohtml/debian/changelog
+++ b/nekohtml/debian/changelog
@@ -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)
diff --git a/nekohtml/src/html/org/cyberneko/html/HTMLScanner.java b/nekohtml/src/html/org/cyberneko/html/HTMLScanner.java
index 917f30c..ae73313 100644
--- a/nekohtml/src/html/org/cyberneko/html/HTMLScanner.java
+++ b/nekohtml/src/html/org/cyberneko/html/HTMLScanner.java
@@ -593,6 +593,16 @@ public class HTMLScanner
         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
     //

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/nekohtml.git