Author: miriam Date: 2011-11-20 02:03:45 +0000 (Sun, 20 Nov 2011) New Revision: 12829
Modified: packages/trunk/bulletml/debian/changelog packages/trunk/bulletml/debian/control packages/trunk/bulletml/debian/patches/fixes.patch Log: Added change to fixes.patch: yyerror (in src/calc.yy) should have const char * as parameter, instead of char *. Closes: #646443 Modified: packages/trunk/bulletml/debian/changelog =================================================================== --- packages/trunk/bulletml/debian/changelog 2011-11-18 22:41:38 UTC (rev 12828) +++ packages/trunk/bulletml/debian/changelog 2011-11-20 02:03:45 UTC (rev 12829) @@ -1,3 +1,11 @@ +bulletml (0.0.6-5) unstable; urgency=low + + * Added change to fixes.patch: yyerror (in src/calc.yy) should have + const char * as parameter, instead of char *. Closes: #646443 + * Upgraded Standards-Version from 3.8.1 to 3.9.2 + + -- Miriam Ruiz <[email protected]> Sun, 20 Nov 2011 02:39:12 +0100 + bulletml (0.0.6-4) unstable; urgency=low * Bulletml depended on Boost just to get boost::shared_ptr. Patched it to Modified: packages/trunk/bulletml/debian/control =================================================================== --- packages/trunk/bulletml/debian/control 2011-11-18 22:41:38 UTC (rev 12828) +++ packages/trunk/bulletml/debian/control 2011-11-20 02:03:45 UTC (rev 12829) @@ -3,7 +3,7 @@ Maintainer: Debian Games Team <[email protected]> Uploaders: Miriam Ruiz <[email protected]>, Peter De Wachter <[email protected]> Build-Depends: debhelper (>= 5), quilt, bison -Standards-Version: 3.8.1 +Standards-Version: 3.9.2 Section: libs Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/bulletml/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/bulletml/?op=log Modified: packages/trunk/bulletml/debian/patches/fixes.patch =================================================================== --- packages/trunk/bulletml/debian/patches/fixes.patch 2011-11-18 22:41:38 UTC (rev 12828) +++ packages/trunk/bulletml/debian/patches/fixes.patch 2011-11-20 02:03:45 UTC (rev 12829) @@ -1,10 +1,8 @@ # Copyright (C) 2007 Marcel Unbehaun <[email protected]> # Distributed under the same license as the original software. See debian/copyright. -Index: bulletml-0.0.6/src/bulletmlparser.h -=================================================================== ---- bulletml-0.0.6.orig/src/bulletmlparser.h 2007-08-28 11:41:02.000000000 +0000 -+++ bulletml-0.0.6/src/bulletmlparser.h 2007-08-28 11:43:23.000000000 +0000 +--- bulletml.orig/src/bulletmlparser.h ++++ bulletml/src/bulletmlparser.h @@ -70,11 +70,10 @@ bool isHorizontal_; @@ -20,10 +18,8 @@ }; -Index: bulletml-0.0.6/src/bulletmlparser-tinyxml.cpp -=================================================================== ---- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.cpp 2007-08-28 11:41:02.000000000 +0000 -+++ bulletml-0.0.6/src/bulletmlparser-tinyxml.cpp 2007-08-28 11:43:23.000000000 +0000 +--- bulletml.orig/src/bulletmlparser-tinyxml.cpp ++++ bulletml/src/bulletmlparser-tinyxml.cpp @@ -5,8 +5,8 @@ #include <string> @@ -44,10 +40,8 @@ doc.LoadFile(); parseImpl(doc); } -Index: bulletml-0.0.6/src/bulletmlparser-tinyxml.h -=================================================================== ---- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.h 2007-08-28 11:41:02.000000000 +0000 -+++ bulletml-0.0.6/src/bulletmlparser-tinyxml.h 2007-08-28 11:43:23.000000000 +0000 +--- bulletml.orig/src/bulletmlparser-tinyxml.h ++++ bulletml/src/bulletmlparser-tinyxml.h @@ -16,12 +16,12 @@ class BulletMLParserTinyXML : public BulletMLParser { @@ -71,10 +65,8 @@ BulletMLNode* curNode_; }; -Index: bulletml-0.0.6/src/bulletmlparser-xerces.cpp -=================================================================== ---- bulletml-0.0.6.orig/src/bulletmlparser-xerces.cpp 2007-08-28 11:41:02.000000000 +0000 -+++ bulletml-0.0.6/src/bulletmlparser-xerces.cpp 2007-08-28 11:43:23.000000000 +0000 +--- bulletml.orig/src/bulletmlparser-xerces.cpp ++++ bulletml/src/bulletmlparser-xerces.cpp @@ -19,9 +19,9 @@ BulletMLParserXercesSAXHandler(BulletMLParserXerces* parser); @@ -106,10 +98,8 @@ parser.reset(0); } -Index: bulletml-0.0.6/src/bulletmlparser-xerces.h -=================================================================== ---- bulletml-0.0.6.orig/src/bulletmlparser-xerces.h 2007-08-28 11:41:02.000000000 +0000 -+++ bulletml-0.0.6/src/bulletmlparser-xerces.h 2007-08-28 11:43:23.000000000 +0000 +--- bulletml.orig/src/bulletmlparser-xerces.h ++++ bulletml/src/bulletmlparser-xerces.h @@ -8,18 +8,14 @@ #ifdef USE_XERCES @@ -130,10 +120,8 @@ friend class BulletMLParserXercesSAXHandler; }; -Index: bulletml-0.0.6/src/bulletmlparser-ygg.cpp -=================================================================== ---- bulletml-0.0.6.orig/src/bulletmlparser-ygg.cpp 2007-08-28 11:41:01.000000000 +0000 -+++ bulletml-0.0.6/src/bulletmlparser-ygg.cpp 2007-08-28 11:43:23.000000000 +0000 +--- bulletml.orig/src/bulletmlparser-ygg.cpp ++++ bulletml/src/bulletmlparser-ygg.cpp @@ -63,8 +63,8 @@ curNode_->setValue(trimString(text.get_text())); } @@ -155,10 +143,8 @@ } std::string BulletMLParserYggdrasil::trimString(const std::string& str) { -Index: bulletml-0.0.6/src/bulletmlparser-ygg.h -=================================================================== ---- bulletml-0.0.6.orig/src/bulletmlparser-ygg.h 2007-08-28 11:41:02.000000000 +0000 -+++ bulletml-0.0.6/src/bulletmlparser-ygg.h 2007-08-28 11:43:23.000000000 +0000 +--- bulletml.orig/src/bulletmlparser-ygg.h ++++ bulletml/src/bulletmlparser-ygg.h @@ -24,7 +24,7 @@ void catch_text(yggdrasil::ygg_node text); @@ -176,10 +162,8 @@ class BulletMLNode* curNode_; }; -Index: bulletml-0.0.6/src/bulletmlrunnerimpl.cpp -=================================================================== ---- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.cpp 2007-08-28 11:41:02.000000000 +0000 -+++ bulletml-0.0.6/src/bulletmlrunnerimpl.cpp 2007-08-28 11:43:41.000000000 +0000 +--- bulletml.orig/src/bulletmlrunnerimpl.cpp ++++ bulletml/src/bulletmlrunnerimpl.cpp @@ -25,8 +25,7 @@ &BulletMLRunnerImpl::runVanish }; @@ -222,10 +206,8 @@ else dir = getNumberContents(dirNode); calcChangeDirection(dir, term, type == BulletMLNode::sequence); -Index: bulletml-0.0.6/src/bulletmlrunnerimpl.h -=================================================================== ---- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.h 2007-08-28 11:41:02.000000000 +0000 -+++ bulletml-0.0.6/src/bulletmlrunnerimpl.h 2007-08-28 11:43:23.000000000 +0000 +--- bulletml.orig/src/bulletmlrunnerimpl.h ++++ bulletml/src/bulletmlrunnerimpl.h @@ -136,7 +136,7 @@ double getNumberContents(const BulletMLNode* node); std::vector<double>* getParameters(); @@ -235,3 +217,23 @@ private: private: +--- bulletml.orig/src/calc.yy ++++ bulletml/src/calc.yy +@@ -16,7 +16,7 @@ + #include "formula.h" + #include "formula-variables.h" + +-int yyerror(char* s); ++int yyerror(const char* s); + int yylex(); + + const char* yyinStr; +@@ -148,7 +148,7 @@ + return c; + } + +-int yyerror(char* s) { ++int yyerror(const char* s) { + printf("yyerror: %s\n", s); + return 0; + } _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
