r9675 - in packages/trunk/sdlbasic/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Wed May 6 15:15:53 UTC 2009
Author: bdefreese
Date: 2009-05-06 15:15:53 +0000 (Wed, 06 May 2009)
New Revision: 9675
Added:
packages/trunk/sdlbasic/debian/patches/bison_code.patch
packages/trunk/sdlbasic/debian/watch
Modified:
packages/trunk/sdlbasic/debian/changelog
packages/trunk/sdlbasic/debian/control
packages/trunk/sdlbasic/debian/copyright
packages/trunk/sdlbasic/debian/patches/series
Log:
* bison_code.patch - Fix syntax with sdlBrt_tab.y.
+ Fixes FTBFS with newer Bison.
* Add Section: debug to sdlbasic-dbg package.
* Minor syntax fixes in debian/copyright.
* Add watch file.
* Bump Standards Version to 3.8.1. (No changes needed).
Modified: packages/trunk/sdlbasic/debian/changelog
===================================================================
--- packages/trunk/sdlbasic/debian/changelog 2009-05-05 18:47:28 UTC (rev 9674)
+++ packages/trunk/sdlbasic/debian/changelog 2009-05-06 15:15:53 UTC (rev 9675)
@@ -1,3 +1,15 @@
+sdlbasic (0.0.20070714-3) UNRELEASED; urgency=low
+
+ [ Barry deFreese ]
+ * bison_code.patch - Fix syntax with sdlBrt_tab.y.
+ + Fixes FTBFS with newer Bison.
+ * Add Section: debug to sdlbasic-dbg package.
+ * Minor syntax fixes in debian/copyright.
+ * Add watch file.
+ * Bump Standards Version to 3.8.1. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org> Wed, 06 May 2009 10:58:14 -0400
+
sdlbasic (0.0.20070714-2) unstable; urgency=low
* Fixed /etc/sdlbasic/sdlBasic.properties
Modified: packages/trunk/sdlbasic/debian/control
===================================================================
--- packages/trunk/sdlbasic/debian/control 2009-05-05 18:47:28 UTC (rev 9674)
+++ packages/trunk/sdlbasic/debian/control 2009-05-06 15:15:53 UTC (rev 9675)
@@ -7,7 +7,7 @@
libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev,
libsdl-net1.2-dev, libsdl-image1.2-dev,
libsmpeg-dev, libgtk2.0-dev, libglib2.0-dev, libasound2-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://sdlbasic.sourceforge.net
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/sdlbasic/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/sdlbasic/?op=log
@@ -32,6 +32,7 @@
and glorious AMOS.
Package: sdlbasic-dbg
+Section: debug
Architecture: any
Depends: sdlbasic (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: BASIC interpreter for game development - debug symbols
Modified: packages/trunk/sdlbasic/debian/copyright
===================================================================
--- packages/trunk/sdlbasic/debian/copyright 2009-05-05 18:47:28 UTC (rev 9674)
+++ packages/trunk/sdlbasic/debian/copyright 2009-05-06 15:15:53 UTC (rev 9675)
@@ -15,24 +15,24 @@
Copyright:
- Copyright (c) 2001-2007 sdlBasic team
+ Copyright (C) 2001-2007 sdlBasic team
src/sdlBasic/src/sdlBrt/*
- Copyright (c) 2001 David Cuny <dcuny at lanset.com>
+ Copyright (C) 2001 David Cuny <dcuny at lanset.com>
lizard.mod:
- Copyright (c) 1993 Gustaf Grefberg <lizardking at triton.ct.se>
+ Copyright (C) 1993 Gustaf Grefberg <lizardking at triton.ct.se>
Scintilla and sdlBasic Editor:
- Copyright (c) 1998-2003 by Neil Hodgson <neilh at scintilla.org>
- Copyright (c) 2005 by sdlBasic team <http://sdlBasic.sf.net>
+ Copyright (C) 1998-2003 by Neil Hodgson <neilh at scintilla.org>
+ Copyright (C) 2005 by sdlBasic team <http://sdlBasic.sf.net>
Bitstream Vera Fonts:
- Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
+ Copyright (C) 2003 by Bitstream, Inc. All Rights Reserved.
Bitstream Vera is a trademark of Bitstream, Inc.
DejaVu changes are in public domain.
@@ -58,8 +58,8 @@
License for Scintilla and sdlBasic Editor:
-Copyright 1998-2003 by Neil Hodgson <neilh at scintilla.org>
-Copyright 2005 by sdlBasic team http://sdlBasic.sf.net
+Copyright (C) 1998-2003 by Neil Hodgson <neilh at scintilla.org>
+Copyright (C) 2005 by sdlBasic team http://sdlBasic.sf.net
All Rights Reserved
@@ -79,12 +79,12 @@
OR PERFORMANCE OF THIS SOFTWARE.
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Fonts are Copyright (C) Bitstream (see below). DejaVu changes are in public domain.
Bitstream Vera Fonts Copyright
------------------------------
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+Copyright (C) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
a trademark of Bitstream, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -141,5 +141,5 @@
[3] http://user.cs.tu-berlin.de/~karlb/bumprace/
-The Debian packaging is (c) 2008, Miriam Ruiz <little_miry at yahoo.es> and
+The Debian packaging is Copyright (C) 2008, Miriam Ruiz <little_miry at yahoo.es> and
is licensed under the same license as the program, see above.
Added: packages/trunk/sdlbasic/debian/patches/bison_code.patch
===================================================================
--- packages/trunk/sdlbasic/debian/patches/bison_code.patch (rev 0)
+++ packages/trunk/sdlbasic/debian/patches/bison_code.patch 2009-05-06 15:15:53 UTC (rev 9675)
@@ -0,0 +1,117 @@
+#Author: Barry deFreese <bdefreese at debian.org>
+#Description: Declare the tokens before the code.
+Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/sdlBrt_tab.y
+===================================================================
+--- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBrt/sdlBrt_tab.y 2009-05-06 10:51:48.000000000 -0400
++++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/sdlBrt_tab.y 2009-05-06 10:52:16.000000000 -0400
+@@ -1,53 +1,3 @@
+-%{
+-
+-/* comma: return a sequence of items to execute */
+-Node *comma( Node *node1, Node *node2 )
+-{
+- return opNode( OpComma, node1, node2 );
+-}
+-
+-/* blockName: returns name of block */
+-char *blockName( int klass )
+-{
+- switch(klass) {
+- case -1: return eCopyString( "end-of-file" );
+- case For: return eCopyString( "End For/Next" );
+- case Function: return eCopyString( "End Function" );
+- case If: return eCopyString( "End If" );
+- case While: return eCopyString( "End While" );
+- case Do: return eCopyString( "Loop" );
+- case Select: return eCopyString( "End Select" );
+- case Sub: return eCopyString( "End Sub" );
+- default: return eCopyString("block");
+- }
+-}
+-
+-/* checkBlockEnd: make sure the block ends correctly */
+-void checkBlockEnd(int got)
+-{
+- int wanted;
+- //char *wantedName, *gotName;
+-
+- if (isEmptyStack(blockStack)) {
+- switch (got) {
+- case For: ePrintf( Syntax, "End For without For");break;
+- case Function: ePrintf( Syntax, "End Function without Function");break;
+- case If: ePrintf( Syntax, "End If without If");break;
+- case While: ePrintf( Syntax, "End While without While");break;
+- case Do: ePrintf( Syntax, "Loop without Do");break;
+- case Select: ePrintf( Syntax, "End Select without Select");break;
+- case Sub: ePrintf( Syntax, "End Sub without Sub");break;
+- }
+- }
+-
+- wanted = peekStack(blockStack);
+- if (got != wanted){
+- ePrintf( Syntax, "expected %s, not %s", blockName(wanted), blockName(got));
+- }
+-}
+-
+-%}
+-
+ /* %no_lines */
+ %union {
+ int iValue; /* integer value */
+@@ -184,6 +134,56 @@
+ %left '*' '/' '\\' '%' Shl Shr
+ %left '^'
+
++%{
++
++/* comma: return a sequence of items to execute */
++Node *comma( Node *node1, Node *node2 )
++{
++ return opNode( OpComma, node1, node2 );
++}
++
++/* blockName: returns name of block */
++char *blockName( int klass )
++{
++ switch(klass) {
++ case -1: return eCopyString( "end-of-file" );
++ case For: return eCopyString( "End For/Next" );
++ case Function: return eCopyString( "End Function" );
++ case If: return eCopyString( "End If" );
++ case While: return eCopyString( "End While" );
++ case Do: return eCopyString( "Loop" );
++ case Select: return eCopyString( "End Select" );
++ case Sub: return eCopyString( "End Sub" );
++ default: return eCopyString("block");
++ }
++}
++
++/* checkBlockEnd: make sure the block ends correctly */
++void checkBlockEnd(int got)
++{
++ int wanted;
++ //char *wantedName, *gotName;
++
++ if (isEmptyStack(blockStack)) {
++ switch (got) {
++ case For: ePrintf( Syntax, "End For without For");break;
++ case Function: ePrintf( Syntax, "End Function without Function");break;
++ case If: ePrintf( Syntax, "End If without If");break;
++ case While: ePrintf( Syntax, "End While without While");break;
++ case Do: ePrintf( Syntax, "Loop without Do");break;
++ case Select: ePrintf( Syntax, "End Select without Select");break;
++ case Sub: ePrintf( Syntax, "End Sub without Sub");break;
++ }
++ }
++
++ wanted = peekStack(blockStack);
++ if (got != wanted){
++ ePrintf( Syntax, "expected %s, not %s", blockName(wanted), blockName(got));
++ }
++}
++
++%}
++
+ %%
+
+ program:
Modified: packages/trunk/sdlbasic/debian/patches/series
===================================================================
--- packages/trunk/sdlbasic/debian/patches/series 2009-05-05 18:47:28 UTC (rev 9674)
+++ packages/trunk/sdlbasic/debian/patches/series 2009-05-06 15:15:53 UTC (rev 9675)
@@ -5,3 +5,4 @@
ldflags.patch
datadir.patch
properties.patch
+bison_code.patch
Added: packages/trunk/sdlbasic/debian/watch
===================================================================
--- packages/trunk/sdlbasic/debian/watch (rev 0)
+++ packages/trunk/sdlbasic/debian/watch 2009-05-06 15:15:53 UTC (rev 9675)
@@ -0,0 +1,4 @@
+version=3
+
+opts="uversionmangle=s/(\d*)\.(\d*)\.(\d*)/0\.0\.$1$2$3/" \
+http://sf.net/sdlbasic/sdlBasic-src-([\d.]+)\.tgz
More information about the Pkg-games-commits
mailing list