[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20090404.1-1-81-g257a5d0

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 257a5d07f225956d30b4af7dd801bdb4299f6a76
Author: Samuel Thibault <address@hidden>
Date:   Sun Aug 1 18:32:28 2010 +0200

    Ignore erroneous number of glyphs in bdf files
    
      * debian/patches/console_ignore_bdf_err.patch: New patch to ignore 
erroneous
        number of glyphs in bdf files.

diff --git a/debian/changelog b/debian/changelog
index 0450f34..60cf200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,7 +46,9 @@ hurd (20100701-1) UNRELEASED; urgency=low
     when installed.
   * debian/source/options: Set compression to bzip2.
   * debian/control: Update Vcs fields to point to the new git repositories.
- 
+  * debian/patches/console_ignore_bdf_err.patch: New patch to ignore erroneous
+    number of glyphs in bdf files.
+
   [ Guillem Jover ]
   * Update make-new-tarball.sh to exclude git instead of CVS paths.
   * Refresh patches with -pab to allow migration to source format 3.0 (quilt).
diff --git a/debian/patches/console_ignore_bdf_err.patch 
b/debian/patches/console_ignore_bdf_err.patch
new file mode 100644
index 0000000..c3ea30c
--- /dev/null
+++ b/debian/patches/console_ignore_bdf_err.patch
@@ -0,0 +1,17 @@
+reduce-font overestimates the number of characters in the font.
+
+diff --git a/console-client/bdf.c b/console-client/bdf.c
+index 30501f4..ee8aa30 100644
+--- a/console-client/bdf.c
++++ b/console-client/bdf.c
+@@ -415,8 +415,10 @@ bdf_read (FILE *filep, bdf_font_t *font, int *linecount)
+            glyphs.  */
+         if (!strcmp (line, "ENDFONT"))
+           {
++            /*
+             if (parser.glyphs != bdf->glyphs_count)
+               err = BDF_COUNT_MISMATCH;
++            */
+             done = 1;
+           }
+         else
diff --git a/debian/patches/series b/debian/patches/series
index aaa67b3..9d9109f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ proxy-defpager.diff
 libpthread_procfs.patch
 makedev_keep_options.patch
 makedev_parted_store.patch
+console_ignore_bdf_err.patch

-- 
Debian GNU Hurd packaging