x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
xkbcomp/ChangeLog | 11 +++++++++++
xkbcomp/xkbscan.c | 4 ++--
3 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit ed61083127d1ec0cfe65d112b22b7f04fab502ad
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 12 10:41:09 2010 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 144bad4..5f06cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-xkb-utils (7.5+5) UNRELEASED; urgency=low
+x11-xkb-utils (7.5+5) unstable; urgency=low
* One more xkbcomp fix, this time to be able to detect EOF on architectures
where 'char' is unsigned (closes: #588658).
- -- Julien Cristau <jcristau@debian.org> Mon, 12 Jul 2010 10:38:55 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Jul 2010 10:40:30 +0100
x11-xkb-utils (7.5+4) unstable; urgency=low
commit ec227124be8f870bbc7281933d5b4cf7ad51ca8d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 12 10:40:17 2010 +0100
Fix xkbcomp vs unsigned char
One more xkbcomp fix, this time to be able to detect EOF on
architectures where 'char' is unsigned (closes: #588658).
diff --git a/debian/changelog b/debian/changelog
index d13ed63..144bad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xkb-utils (7.5+5) UNRELEASED; urgency=low
+
+ * One more xkbcomp fix, this time to be able to detect EOF on architectures
+ where 'char' is unsigned (closes: #588658).
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Jul 2010 10:38:55 +0100
+
x11-xkb-utils (7.5+4) unstable; urgency=low
* Pull an xkbcomp fix from git, thanks to Alexandre Isoard for the report.
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index 15ccfbb..677b0c1 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,3 +1,14 @@
+commit 61b3d4b024d8146cb0e7659aa958045ceb72c482
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Jul 12 10:28:32 2010 +0100
+
+ Fix signedness issue with getc() return value
+
+ getc() and ungetc() return and take, respectively, an int rather than a
+ char to allow for error values as well. Oops.
+
+ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
commit a281386fa887e6bf4110840779aed46dd0ac89b6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 9 19:34:29 2010 +0100
diff --git a/xkbcomp/xkbscan.c b/xkbcomp/xkbscan.c
index 1e7902d..03193e2 100644
--- a/xkbcomp/xkbscan.c
+++ b/xkbcomp/xkbscan.c
@@ -269,7 +269,7 @@ tokText(int tok)
}
#endif
-static char
+static int
scanchar(void)
{
if (readBufPos >= readBufLen) {
@@ -285,7 +285,7 @@ scanchar(void)
}
static void
-unscanchar(char c)
+unscanchar(int c)
{
if (readBuf[--readBufPos] != c) {
fprintf(stderr, "UNGETCHAR FAILED! Put back %c, was expecting %c at "
Reply to: