[SCM] whitedune/master: Imported Debian patch 0.28.14-1.1

rzr-guest at users.alioth.debian.org rzr-guest at users.alioth.debian.org
Fri Apr 29 12:50:07 UTC 2011


Imported Upstream version 0.28.14
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3d83a8f4a04ea29855cc488f0daf0a399a4bf0a9
X-Git-Newrev: 1f62aa7a5d33226c82fa019e8feec58bb4c9dd70

The following commit has been merged in the master branch:
commit 436e29885719736c59237bbab883ce0eeed0329f
Merge: 65b1ce035a840b6300af1d59c88857ef29a47888 9ff2f706e8aa4a174adfd75e9af16b60b6f0322b
Author: Tim Retout <tim at retout.co.uk>
Date:   Thu Dec 24 15:51:59 2009 +0000

    Imported Debian patch 0.28.14-1.1

diff --combined configure.in
index 7627c00,7627c00..4eea111
--- a/configure.in
+++ b/configure.in
@@@ -185,7 -185,7 +185,7 @@@ AC_PROG_YAC
  AC_PROG_LEX
  
  dnl check for webbrowsers
--AC_PATH_PROGS(WWWBROWSER,[netscape phoenix galeon firebird opera mozilla lynx links])
++AC_PATH_PROGS(WWWBROWSER,[x-www-browser iceweasel firefox phoenix galeon firebird opera mozilla lynx links netscape])
  
  if test "X_$WWWBROWSER" = "X_" ; then
     WWWBROWSER=netscape
diff --combined debian/changelog
index 96b3d92,0000000..e2b0de3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,0 +1,39 @@@
++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 <tim at retout.co.uk>  Thu, 24 Dec 2009 15:51:59 +0000
++
++whitedune (0.28.14-1) unstable; urgency=low
++
++  * New upstream release
++  * prefer x-www-browser over netscape (LP:#399981)	
++  * debian/control :
++    - Update dependencies (Closes: #515402)
++    - Update email to non bouncing domain
++    - Update upstream URL, description
++    - Update standards to current ones
++  * debian/changelog :
++    - Fix licences versions
++
++ -- Philippe Coval <rzr at gna.org>  Sat, 25 Jul 2009 18:39:55 +0200
++
 +whitedune (0.28.13-1) unstable; urgency=low
 +
 +  * NEW: upstream release (which fix buffer overflow exploit)
 +  * minor fixes : copyright, manpages, makefile
 +
 + -- Philippe Coval <rzr at users.sf.net>  Wed, 02 Jan 2008 10:32:04 +0100
 +
 +whitedune (0.28.12-1) experimental; urgency=low
 +
 +  * Intial release (Closes: #400739 )
 +  * info : package based on previous work done upstream 
 +  (by Thiemo Seufer then J. "MUFTI" Scheurich)
 +
 + -- Philippe Coval <rzr at users.sf.net>  Tue, 17 Jul 2007 19:52:00 +0200
- 
diff --combined debian/control
index ef00693,ef00693..b525c62
--- a/debian/control
+++ b/debian/control
@@@ -1,16 -1,16 +1,17 @@@
  Source: whitedune
  Section: graphics
  Priority: optional
--Maintainer: Philippe Coval <rzr at users.sf.net>
--Build-Depends: debhelper (>= 5), autotools-dev, automake1.9, autoconf, bison, flex, gawk, xbase-clients, libxmu-dev, libxi-dev, x-dev, lesstif2-dev, libpng12-dev, libjpeg62-dev, libglu1-mesa-dev, xlibmesa-gl-dev , libgl1-mesa-dev | libgl-dev  | freeglut3-dev
--Standards-Version: 3.7.3
--Homepage: http://www.csv.ica.uni-stuttgart.de/vrml/dune/
++Maintainer: Philippe Coval <rzr at gna.org>
++Build-Depends: debhelper (>= 5), autotools-dev, automake1.9, autoconf, bison, flex, gawk, libxmu-dev, libxi-dev, x11proto-core-dev, lesstif2-dev, libpng12-dev, libjpeg62-dev, libglu1-mesa-dev, libgl1-mesa-dev, libgl1-mesa-dev | libgl-dev  | freeglut3-dev
++Standards-Version: 3.8.2
++Homepage: http://vrml.cip.ica.uni-stuttgart.de/dune/
  
  Package: whitedune
  Architecture: any
  Depends: ${shlibs:Depends}
++Recommends: xfonts-100dpi
  Suggests: whitedune-docs
--Description: graphical VRML97 viewer, editor, 3D modeller and animation tool
++Description: graphical VRML97/X3D viewer, editor, 3D modeller and animation tool
   Whitedune can read VRML97 files, display and let the user change the 
   scenegraph and all fields of all nodes. 
   .
diff --combined debian/copyright
index f3dfd52,f3dfd52..d136134
--- a/debian/copyright
+++ b/debian/copyright
@@@ -7,7 -7,7 +7,7 @@@ Files: ./debian/
  Copyright: (c) 2006 Philippe Coval <rzr at users.sf.net>
  Licence: GPL-2+
   On Debian systems, the complete text of the GNU General Public License
-- can be found in file "/usr/share/common-licenses/GPL".
++ can be found in file "/usr/share/common-licenses/GPL-2".
  
  File:./src/pngLoad.*
  Copyright: Chris Morley <cmorley at vermontel.net>
@@@ -99,9 -99,9 +99,9 @@@ File: ./docs/scriptedNodes/SuperEllipso
   docs/vrml97Amendment1/NurbsTextureSurfacePROTO.wrl
   docs/vrml97Amendment1/Polyline2DPROTO.wrl
   docs/vrml97Amendment1/TrimmedSurfacePROTO.wrl
--Licence: LGPL
++Licence: LGPL-2+
   On Debian systems, the complete text of the GNU General Public
-- License can be found in the file `/usr/share/common-licenses/LGPL'.
++ License can be found in the file `/usr/share/common-licenses/LGPL-2'.
  
  Files: ./*  (rest of the files not all)
  Copyright: 2006 Stephen F. White (and others) <swhite(a)Discreet.COM> 
diff --combined debian/whitedune-docs.doc-base
index cd0acdf,cd0acdf..3c12156
--- a/debian/whitedune-docs.doc-base
+++ b/debian/whitedune-docs.doc-base
@@@ -2,7 -2,7 +2,7 @@@ Document: whitedun
  Title: Debian whitedune Manual
  Author: J. "MUFTI" Scheurich, Roberto "BobMaX" Angeletti, Maksim Diachkov
  Abstract: how to use the whitedune VRML editor and VRML examples
--Section: graphics
++Section: Graphics
  
  Format: HTML
  Index: /usr/share/doc/whitedune-docs/docs/index.html
diff --combined src/parser.y
index 377ac99,377ac99..9d4b444
--- a/src/parser.y
+++ b/src/parser.y
@@@ -289,23 -289,23 +289,25 @@@ empty
  	;
  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;
  			               }
  			            }
diff --combined src/resource.c
index 7deb959,2f709ed..fd39604
--- a/src/resource.c
+++ b/src/resource.c
@@@ -337,7 -337,7 +337,7 @@@ RCNode swResources[622] = 
      { RCT_MENU, -1, "&Help", 0, 0, 0, 0, 0, 331, -1, 328 },
      { RCT_MENUBAR, 133, "", 0, 0, 0, 0, 0, 332, -1, 124 },
      { RCT_DIALOG, 100, "About dune", 0, 0, 287, 240, 0, 333, -1, 334 },
-     { RCT_LABEL, -1, "white_dune whitedune-0.28.13", 40, 7, 119, 8, 0, 334, 335, -1 },
 -    { RCT_LABEL, -1, "white_dune 0.28pl13", 40, 7, 119, 8, 0, 334, 335, -1 },
++    { RCT_LABEL, -1, "white_dune whitedune-0.28.14", 40, 7, 119, 8, 0, 334, 335, -1 },
      { RCT_LABEL, -1, "Copyright (C)  2001 Stephen F. White and others", 40, 18, 185, 11, 0, 335, 336, -1 },
      { RCT_LABEL, -1, "GNU General Public License (GPL)", 40, 33, 185, 11, 0, 336, 337, -1 },
      { RCT_BUTTON, 1, "OK", 230, 5, 28, 14, 0, 337, 338, -1 },

-- 
whitedune packaging



More information about the pkg-multimedia-commits mailing list