Bug#562691: whitedune: diff for NMU version 0.28.14-1.1

[Tim Retout]

Package: whitedune
Version: 0.28.14-1
Severity: normal
Tags: patch

Dear maintainer,

I've prepared an NMU for whitedune (versioned as 0.28.14-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

This fixes the FTBFS with newer bison versions, and adds xfonts-100dpi to
Recommends so that the binary does not give a segmentation fault on startup.

Regards,

-- 
Tim Retout <t...@retout.co.uk>

diff -u whitedune-0.28.14/debian/control whitedune-0.28.14/debian/control
--- whitedune-0.28.14/debian/control
+++ whitedune-0.28.14/debian/control
@@ -9,6 +9,7 @@
 Package: whitedune
 Architecture: any
 Depends: ${shlibs:Depends}
+Recommends: xfonts-100dpi
 Suggests: whitedune-docs
 Description: graphical VRML97/X3D viewer, editor, 3D modeller and animation tool
  Whitedune can read VRML97 files, display and let the user change the 
diff -u whitedune-0.28.14/debian/changelog whitedune-0.28.14/debian/changelog
--- whitedune-0.28.14/debian/changelog
+++ whitedune-0.28.14/debian/changelog
@@ -1,3 +1,14 @@
+whitedune (0.28.14-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Set urgency to 'medium' for RC bug fixes.
+  * debian/control: Add 'xfonts-100dpi' to Recommends.  Fixes segmentation
+    fault on startup. (Closes: #550459)
+  * src/parser.y: Apply patch from upstream version 0.29beta1391 to fix
+    bison 3.4.1 compatibility problem.  Fixes FTBFS. (Closes: #562683)
+
+ -- Tim Retout <t...@retout.co.uk>  Thu, 24 Dec 2009 15:51:59 +0000
+
 whitedune (0.28.14-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- whitedune-0.28.14.orig/src/parser.y
+++ whitedune-0.28.14/src/parser.y
@@ -289,23 +289,25 @@
 	;
 node:
 	  nodeType WING_BRACKET_ON  { 
-                                    $$ = newNode(SYMB($1)); 
-                                    addCommentsToNode($$);
-                                    nodeStack.push($$);
+                                    $<node>$ = newNode(SYMB($1)); 
+                                    addCommentsToNode($<node>$);
+                                    nodeStack.push($<node>$);
 			            if (defName != -1) 
                                        { 
-				       scene->def(uniqName(SYMB(defName)), $$);
+				       scene->def(uniqName(SYMB(defName)),
+						  $<node>$);
 				       defName = -1;
 			               }
 			            }
 	  nodeBody WING_BRACKET_OFF { $$ = nodeStack.pop(); }
 	| SCRIPT WING_BRACKET_ON    { 
-                                    $$ = new NodeScript(scene);
-                                    addCommentsToNode($$); 
-                                    nodeStack.push($$);
+                                    $<node>$ = new NodeScript(scene);
+                                    addCommentsToNode($<node>$); 
+                                    nodeStack.push($<node>$);
 			            if (defName != -1) 
                                        { 
-				       scene->def(uniqName(SYMB(defName)), $$);
+				       scene->def(uniqName(SYMB(defName)),
+						  $<node>$);
 				       defName = -1;
 			               }
 			            }