Bug#378447: vflib3 3.6.13-3.5 NMU

[Matej Vela]

Hello,

I'm doing an NMU of vflib3 to fix #170529 and #378447; diff attached.

Thanks,

Matej

diff -u vflib3-3.6.13/debian/changelog vflib3-3.6.13/debian/changelog
--- vflib3-3.6.13/debian/changelog
+++ vflib3-3.6.13/debian/changelog
@@ -1,3 +1,12 @@
+vflib3 (3.6.13-3.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Make vflib3-dev depend on libkpathsea-dev.  Closes: #378447.
+  * Fix `comparison is always false' warnings on platforms where char
+    is unsigned by default.  Closes: #170529.
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Sun, 23 Jul 2006 18:59:19 +0200
+
 vflib3 (3.6.13-3.4) unstable; urgency=high
 
   * Non-maintainer upload.
diff -u vflib3-3.6.13/debian/control vflib3-3.6.13/debian/control
--- vflib3-3.6.13/debian/control
+++ vflib3-3.6.13/debian/control
@@ -8,7 +8,7 @@
 Package: vflib3-dev
 Section: libdevel
 Architecture: any
-Depends: vflib3 (= ${Source-Version}), libttf-dev, libt1-dev, libc6-dev
+Depends: vflib3 (= ${Source-Version}), libttf-dev, libkpathsea-dev, libt1-dev, 
libc6-dev
 Description: Development files for VFlib3
  VFlib3 is a font rasterizer library for multi-lingual information 
  processing.  Using VFlib3, you can obtain bitmap data of characters(glyphs)
diff -u vflib3-3.6.13/debian/patches/00list vflib3-3.6.13/debian/patches/00list
--- vflib3-3.6.13/debian/patches/00list
+++ vflib3-3.6.13/debian/patches/00list
@@ -2,0 +3 @@
+03_comparison_always_false
only in patch2:
unchanged:
--- vflib3-3.6.13.orig/debian/patches/03_comparison_always_false.dpatch
+++ vflib3-3.6.13/debian/patches/03_comparison_always_false.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_comparison_always_false.dpatch by Matej Vela <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix `comparison is always false' warnings on platforms where char
+## DP: is unsigned by default (this might lead to infinite loops).
+
[EMAIL PROTECTED]@
+diff -urNad vflib3-3.6.13~/src/sexp.c vflib3-3.6.13/src/sexp.c
+--- vflib3-3.6.13~/src/sexp.c
++++ vflib3-3.6.13/src/sexp.c
+@@ -707,7 +707,7 @@
+ 
+ 
+ static int  vf_sexp_do_read_from_stream(SEXP_STREAM stream, SEXP sexp);
+-static int  vf_sexp_read_str(SEXP_STREAM stream, char ch, SEXP sexp);
++static int  vf_sexp_read_str(SEXP_STREAM stream, int ch, SEXP sexp);
+ static int  vf_sexp_skip(SEXP_STREAM stream);
+ static char vf_get_char_esc(char **pp, SEXP_STREAM stream);
+ #define  NBUFFER_MIN    2*1024
+@@ -787,7 +787,7 @@
+ }
+ 
+ static int
+-vf_sexp_read_str(SEXP_STREAM stream, char ch, SEXP s)
++vf_sexp_read_str(SEXP_STREAM stream, int ch, SEXP s)
+ {
+   char         tmp[8];
+   int          ch1, dq_str;