Bug#565000: Patch

2011-08-21 Thread Jessica T McKellar

Tags: patch

Hi,

Attached is a small patch that fixes the FTBFS; the changelog describes 
the code and Makefile adjustments.


Regards,
-Jessicadiff -u hubbub-0.0.1/debian/changelog hubbub-0.0.1/debian/changelog
--- hubbub-0.0.1/debian/changelog
+++ hubbub-0.0.1/debian/changelog
@@ -1,3 +1,11 @@
+hubbub (0.0.1-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc-4.5 by correcting an enum-compare warning and adding a
+compiler flag to suppress unused-but-set-variable warnings (closes: 
#565000).
+
+ -- Jessica McKellar jesst...@mit.edu  Sun, 21 Aug 2011 18:41:35 -0400
+
 hubbub (0.0.1-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- hubbub-0.0.1.orig/Makefile
+++ hubbub-0.0.1/Makefile
@@ -12,7 +12,8 @@
 # Toolchain flags
 WARNFLAGS := -Wall -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-   -Wmissing-declarations -Wnested-externs -Werror -pedantic
+   -Wmissing-declarations -Wnested-externs -Werror \
+   -Wno-error=unused-but-set-variable -pedantic
 ifneq ($(GCCVER),2)
   WARNFLAGS := $(WARNFLAGS) -Wextra
 endif
only in patch2:
unchanged:
--- hubbub-0.0.1.orig/src/parser.c
+++ hubbub-0.0.1/src/parser.c
@@ -295,8 +295,8 @@
return HUBBUB_BADPARM;
 
perror = parserutils_inputstream_append(parser-stream, NULL, 0);
-   if (perror != HUBBUB_OK)
-   return !HUBBUB_OK;
+   if (perror != PARSERUTILS_OK)
+   return hubbub_error_from_parserutils_error(perror);
 
error = hubbub_tokeniser_run(parser-tok);
if (error != HUBBUB_OK)


Bug#565000: The patch looks good, but we should also make sure the code hunk is upstream

2011-08-21 Thread Jessica T McKellar

Thanks for following up on this, Asheesh.

I can't find an upstream bug tracking system, but we should make sure to 
share this.


As it turns out, the upstream maintainers made the same code change in 
hubbub-0.0.2.


-Jessica



--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org