Hi,

I have uploaded the attached patch as NMU.


Cheers,

Michael
diff -u jbofihe-0.38/debian/rules jbofihe-0.38/debian/rules
--- jbofihe-0.38/debian/rules
+++ jbofihe-0.38/debian/rules
@@ -23,9 +23,14 @@
 
        ln -sf /usr/share/lojban/lujvo.txt .
        ln -sf /usr/share/lojban/NORALUJV.txt .
-       PATH=`pwd`/bin:$$PATH \
-               $(MAKE) all
 
+       #work arround an issue with including multiple bision parsers in one
+       #C source file
+       PATH=`pwd`/bin:$$PATH $(MAKE) stag.h
+       sed -i s/YYTOKENTYPE/STAGYYTOKENTYPE/ stag.h
+       sed -i s/yytokentype/stagyytokentype/ stag.h
+
+       PATH=`pwd`/bin:$$PATH $(MAKE) all
        touch build-stamp
 
 clean:
diff -u jbofihe-0.38/debian/changelog jbofihe-0.38/debian/changelog
--- jbofihe-0.38/debian/changelog
+++ jbofihe-0.38/debian/changelog
@@ -1,3 +1,11 @@
+jbofihe (0.38-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Applied patch by Peter Green (except for the -Werror changes) to fix build
+    error. (closes: #521952) 
+
+ -- Michael Banck <mba...@debian.org>  Sun, 29 Nov 2009 00:34:26 +0100
+
 jbofihe (0.38-5) unstable; urgency=low
 
   * s/lujvo-list/lujvo.txt/ in the rules file and Makefile.in to match a
only in patch2:
unchanged:
--- jbofihe-0.38.orig/morf.c
+++ jbofihe-0.38/morf.c
@@ -32,6 +32,8 @@
  * 
  *********************************************************************/
 
+#include <stdlib.h>
+
 #ifdef TEST_MORF
 #include <stdio.h>
 #include <string.h>
only in patch2:
unchanged:
--- jbofihe-0.38.orig/functions.c
+++ jbofihe-0.38/functions.c
@@ -25,6 +25,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 #include "functions.h"
 #include "nonterm.h"
 #include "rpc_tab.h"
only in patch2:
unchanged:
--- jbofihe-0.38.orig/categ.c
+++ jbofihe-0.38/categ.c
@@ -31,6 +31,7 @@
 #include "rpc_tab.h"
 #include "functions.h"
 #include "stag.h"
+#include <string.h>
 
 /*++++++++++++++++++++++++++++++
   Look for any cmavo of selma'o JA and back up to where the 'jek'

Reply via email to