r3895 - in packages/trunk/bulletml: . debian debian/patches
Miriam Ruiz
baby-guest at alioth.debian.org
Mon Aug 27 20:59:29 UTC 2007
Author: baby-guest
Date: 2007-08-27 20:59:29 +0000 (Mon, 27 Aug 2007)
New Revision: 3895
Added:
packages/trunk/bulletml/debian/
packages/trunk/bulletml/debian/README.Debian
packages/trunk/bulletml/debian/bulletml-dev.dirs
packages/trunk/bulletml/debian/bulletml-dev.install
packages/trunk/bulletml/debian/bulletml1.install
packages/trunk/bulletml/debian/changelog
packages/trunk/bulletml/debian/compat
packages/trunk/bulletml/debian/control
packages/trunk/bulletml/debian/copyright
packages/trunk/bulletml/debian/docs
packages/trunk/bulletml/debian/patches/
packages/trunk/bulletml/debian/patches/bulletml_d.patch
packages/trunk/bulletml/debian/patches/d_cpp.patch
packages/trunk/bulletml/debian/patches/fixes.patch
packages/trunk/bulletml/debian/patches/series
packages/trunk/bulletml/debian/rules
packages/trunk/bulletml/debian/shlibs.local.ex
packages/trunk/bulletml/debian/watch.ex
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: packages/trunk/bulletml/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/trunk/bulletml/debian/README.Debian
===================================================================
--- packages/trunk/bulletml/debian/README.Debian (rev 0)
+++ packages/trunk/bulletml/debian/README.Debian 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,6 @@
+bulletml for Debian
+-------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Mon, 27 Aug 2007 19:48:05 +0000
Added: packages/trunk/bulletml/debian/bulletml-dev.dirs
===================================================================
--- packages/trunk/bulletml/debian/bulletml-dev.dirs (rev 0)
+++ packages/trunk/bulletml/debian/bulletml-dev.dirs 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
Added: packages/trunk/bulletml/debian/bulletml-dev.install
===================================================================
--- packages/trunk/bulletml/debian/bulletml-dev.install (rev 0)
+++ packages/trunk/bulletml/debian/bulletml-dev.install 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,6 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+usr/lib/*.la
+usr/share/pkgconfig/*
Added: packages/trunk/bulletml/debian/bulletml1.install
===================================================================
--- packages/trunk/bulletml/debian/bulletml1.install (rev 0)
+++ packages/trunk/bulletml/debian/bulletml1.install 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
Added: packages/trunk/bulletml/debian/changelog
===================================================================
--- packages/trunk/bulletml/debian/changelog (rev 0)
+++ packages/trunk/bulletml/debian/changelog 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,6 @@
+bulletml (0.0.6-1) unstable; urgency=low
+
+ * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Mon, 27 Aug 2007 19:48:05 +0000
+
Added: packages/trunk/bulletml/debian/compat
===================================================================
--- packages/trunk/bulletml/debian/compat (rev 0)
+++ packages/trunk/bulletml/debian/compat 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1 @@
+5
Added: packages/trunk/bulletml/debian/control
===================================================================
--- packages/trunk/bulletml/debian/control (rev 0)
+++ packages/trunk/bulletml/debian/control 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,20 @@
+Source: bulletml
+Priority: extra
+Maintainer: Miriam Ruiz <little_miry at yahoo.es>
+Build-Depends: debhelper (>= 5), quilt
+Standards-Version: 3.7.2
+Section: libs
+
+Package: bulletml-dev
+Section: libdevel
+Architecture: any
+Depends: bulletmlBROKEN (= ${Source-Version})
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
+
+Package: bulletmlBROKEN
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
Added: packages/trunk/bulletml/debian/copyright
===================================================================
--- packages/trunk/bulletml/debian/copyright (rev 0)
+++ packages/trunk/bulletml/debian/copyright 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,45 @@
+This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
+Mon, 27 Aug 2007 19:48:05 +0000.
+
+It was downloaded from http://shinh.skr.jp/libbulletml/index_en.html
+
+Upstream Author:
+
+ shinichiro.h <hamaji at nii.ac.jp>
+ http://shinh.skr.jp/
+
+Copyright:
+
+ Copyright (c) 2003, shinichiro.h
+
+License:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+The Debian packaging is (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: packages/trunk/bulletml/debian/docs
===================================================================
--- packages/trunk/bulletml/debian/docs (rev 0)
+++ packages/trunk/bulletml/debian/docs 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,3 @@
+README
+README.bulletml
+README.en
Added: packages/trunk/bulletml/debian/patches/bulletml_d.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/bulletml_d.patch (rev 0)
+++ packages/trunk/bulletml/debian/patches/bulletml_d.patch 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,97 @@
+Index: bulletml-0.0.6/src/bulletml_d.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ bulletml-0.0.6/src/bulletml_d.cpp 2007-08-27 20:47:08.000000000 +0000
+@@ -0,0 +1,92 @@
++#include "d_cpp_interface.h"
++
++#include "bulletmlparser.h"
++#include "bulletmlparser-tinyxml.h"
++#include "bulletmlrunner.h"
++
++// BulletMLParserTinyXML
++extern "C" {
++ D_CPP_CLASS(BulletMLParserTinyXML, BulletMLParserTinyXML)
++ D_CPP_NEW_1(BulletMLParserTinyXML, BulletMLParserTinyXML_new, const char*)
++ D_CPP_METHOD_0(BulletMLParserTinyXML, parse, BulletMLParserTinyXML_parse, void)
++ D_CPP_DELETE(BulletMLParserTinyXML, BulletMLParserTinyXML_delete)
++}
++
++// BulletMLParser
++extern "C" {
++ D_CPP_CLASS(BulletMLParser, BulletMLParser)
++}
++
++// BulletMLState
++extern "C" {
++ D_CPP_CLASS(BulletMLState, BulletMLState)
++}
++
++// BulletMLRunner virtual functions
++D_CPP_BASE_CLASS_OPEN(BulletMLRunner, BulletMLRunnerD)
++
++BulletMLRunnerD(BulletMLParser* p) : BulletMLRunner(p), D_getRand_fp(0) {}
++BulletMLRunnerD(BulletMLState* s) : BulletMLRunner(s), D_getRand_fp(0) {}
++
++D_CPP_VIRTUAL_METHOD_0(BulletMLRunnerD, getBulletDirection, double)
++D_CPP_VIRTUAL_METHOD_0(BulletMLRunnerD, getAimDirection, double)
++D_CPP_VIRTUAL_METHOD_0(BulletMLRunnerD, getBulletSpeed, double)
++D_CPP_VIRTUAL_METHOD_0(BulletMLRunnerD, getDefaultSpeed, double)
++D_CPP_VIRTUAL_METHOD_0(BulletMLRunnerD, getRank, double)
++D_CPP_VIRTUAL_METHOD_2(BulletMLRunnerD, createSimpleBullet, void, double, double)
++D_CPP_VIRTUAL_METHOD_3(BulletMLRunnerD, createBullet, void, BulletMLState*, double, double)
++D_CPP_VIRTUAL_METHOD_0(BulletMLRunnerD, getTurn, int)
++D_CPP_VIRTUAL_METHOD_0(BulletMLRunnerD, doVanish, void)
++
++D_CPP_VIRTUAL_METHOD_1(BulletMLRunnerD, doChangeDirection, void, double)
++D_CPP_VIRTUAL_METHOD_1(BulletMLRunnerD, doChangeSpeed, void, double)
++D_CPP_VIRTUAL_METHOD_1(BulletMLRunnerD, doAccelX, void, double)
++D_CPP_VIRTUAL_METHOD_1(BulletMLRunnerD, doAccelY, void, double)
++D_CPP_VIRTUAL_METHOD_0(BulletMLRunnerD, getBulletSpeedX, double)
++D_CPP_VIRTUAL_METHOD_0(BulletMLRunnerD, getBulletSpeedY, double)
++
++double (*D_getRand_fp) (BulletMLRunnerD*);
++virtual double getRand() {
++ if (D_getRand_fp) {
++ return D_getRand_fp(this);
++ }
++ else {
++ return BulletMLRunner::getRand();
++ }
++}
++void D_set_getRand(double (*fp) (BulletMLRunnerD*)) {
++ D_getRand_fp = fp;
++}
++
++D_CPP_BASE_CLASS_CLOSE()
++
++// BulletMLRunner
++extern "C" {
++ D_CPP_CLASS(BulletMLRunner, BulletMLRunner)
++ D_CPP_CLASS(BulletMLRunnerD, BulletMLRunnerD)
++ D_CPP_NEW_1(BulletMLRunnerD, BulletMLRunner_new_parser, BulletMLParser*)
++ D_CPP_NEW_1(BulletMLRunnerD, BulletMLRunner_new_state, BulletMLState*)
++ D_CPP_DELETE(BulletMLRunnerD, BulletMLRunner_delete)
++ D_CPP_METHOD_0(BulletMLRunnerD, run, BulletMLRunner_run, void)
++ D_CPP_METHOD_0(BulletMLRunnerD, isEnd, BulletMLRunner_isEnd, bool)
++
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, getBulletDirection, BulletMLRunner_set_getBulletDirection, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, getAimDirection, BulletMLRunner_set_getAimDirection, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, getBulletSpeed, BulletMLRunner_set_getBulletSpeed, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, getDefaultSpeed, BulletMLRunner_set_getDefaultSpeed, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, getRank, BulletMLRunner_set_getRank, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_2(BulletMLRunnerD, createSimpleBullet, BulletMLRunner_set_createSimpleBullet, void, double, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_3(BulletMLRunnerD, createBullet, BulletMLRunner_set_createBullet, void, BulletMLState*, double, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, getTurn, BulletMLRunner_set_getTurn, int)
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, doVanish, BulletMLRunner_set_doVanish, void)
++
++ D_CPP_VIRTUAL_METHOD_SETTER_1(BulletMLRunnerD, doChangeDirection, BulletMLRunner_set_doChangeDirection, void, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_1(BulletMLRunnerD, doChangeSpeed, BulletMLRunner_set_doChangeSpeed, void, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_1(BulletMLRunnerD, doAccelX, BulletMLRunner_set_doAccelX, void, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_1(BulletMLRunnerD, doAccelY, BulletMLRunner_set_doAccelY, void, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, getBulletSpeedX, BulletMLRunner_set_getBulletSpeedX, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, getBulletSpeedY, BulletMLRunner_set_getBulletSpeedY, double)
++ D_CPP_VIRTUAL_METHOD_SETTER_0(BulletMLRunnerD, getRand, BulletMLRunner_set_getRand, double)
++
++}
++
Added: packages/trunk/bulletml/debian/patches/d_cpp.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/d_cpp.patch (rev 0)
+++ packages/trunk/bulletml/debian/patches/d_cpp.patch 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,10 @@
+Index: bulletml-0.0.6/d_cpp/d_cpp_interface.h
+===================================================================
+--- bulletml-0.0.6.orig/d_cpp/d_cpp_interface.h 2007-08-27 20:50:38.000000000 +0000
++++ bulletml-0.0.6/d_cpp/d_cpp_interface.h 2007-08-27 20:50:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-#define D_CPP_CLASS(CLASS, CLASS_NAME) ;
++#define D_CPP_CLASS(CLASS, CLASS_NAME)
+
+ #define D_CPP_NEW_0(CLASS, NEW_NAME) \
+ CLASS* NEW_NAME() { \
Added: packages/trunk/bulletml/debian/patches/fixes.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/fixes.patch (rev 0)
+++ packages/trunk/bulletml/debian/patches/fixes.patch 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,329 @@
+Index: bulletml-0.0.6/src/bulletmlparser.h
+===================================================================
+--- bulletml-0.0.6.orig/src/bulletmlparser.h 2007-08-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser.h 2007-08-27 20:47:07.000000000 +0000
+@@ -70,11 +70,10 @@
+ bool isHorizontal_;
+
+ protected:
+- /// ˆêŽž“I‚È“±“ü
+- void setName(const std::string& name) { name_ = name; }
+- std::string name_;
++ void setName(const char* name) { name_ = name; }
++ const char* name_;
+ public:
+- DECLSPEC const std::string& getName() const { return name_; }
++ DECLSPEC const char* getName() const { return name_; }
+
+ };
+
+Index: bulletml-0.0.6/src/bulletmlparser-tinyxml.cpp
+===================================================================
+--- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.cpp 2007-08-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-tinyxml.cpp 2007-08-27 20:47:07.000000000 +0000
+@@ -5,8 +5,8 @@
+
+ #include <string>
+
+-BulletMLParserTinyXML::BulletMLParserTinyXML(const std::string& filename)
+- : xmlFile_(filename), curNode_(0)
++BulletMLParserTinyXML::BulletMLParserTinyXML(const char* filename)
++ : curNode_(0)
+ {
+ setName(filename);
+ }
+@@ -71,7 +71,7 @@
+ }
+
+ void BulletMLParserTinyXML::parse() {
+- TiXmlDocument doc(xmlFile_.c_str());
++ TiXmlDocument doc(name_);
+ doc.LoadFile();
+ parseImpl(doc);
+ }
+Index: bulletml-0.0.6/src/bulletmlparser-tinyxml.h
+===================================================================
+--- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.h 2007-08-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-tinyxml.h 2007-08-27 20:47:07.000000000 +0000
+@@ -16,12 +16,12 @@
+
+ class BulletMLParserTinyXML : public BulletMLParser {
+ public:
+- DECLSPEC BulletMLParserTinyXML(const std::string& filename);
++ DECLSPEC BulletMLParserTinyXML(const char* filename);
+ DECLSPEC virtual ~BulletMLParserTinyXML();
+
+ DECLSPEC virtual void parse();
+
+-protected:
++private:
+ void parseImpl(TiXmlDocument& doc);
+
+ protected:
+@@ -29,7 +29,6 @@
+ void translateNode(TiXmlNode* node);
+
+ private:
+- std::string xmlFile_;
+ BulletMLNode* curNode_;
+ };
+
+Index: bulletml-0.0.6/src/bulletmlparser-xerces.cpp
+===================================================================
+--- bulletml-0.0.6.orig/src/bulletmlparser-xerces.cpp 2007-08-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-xerces.cpp 2007-08-27 20:47:07.000000000 +0000
+@@ -19,9 +19,9 @@
+ BulletMLParserXercesSAXHandler(BulletMLParserXerces* parser);
+
+ virtual void characters(const XMLCh* const chars,
+- const unsigned int length);
++ const unsigned int length);
+ virtual void startElement(const XMLCh* const name,
+- AttributeList& attributes);
++ AttributeList& attributes);
+ virtual void endElement(const XMLCh* const name);
+
+ virtual void error(const SAXParseException& e) {
+@@ -94,8 +94,7 @@
+ curNode_ = curNode_->getParent();
+ }
+
+-BulletMLParserXerces::BulletMLParserXerces(const std::string& filename)
+- : xmlFile_(filename)
++BulletMLParserXerces::BulletMLParserXerces(const char* filename)
+ {
+ setName(filename);
+ }
+@@ -117,7 +116,7 @@
+ parser->setDocumentHandler(&handler);
+ parser->setErrorHandler(&handler);
+
+- parser->parse(xmlFile_.c_str());
++ parser->parse(name_);
+
+ parser.reset(0);
+ }
+Index: bulletml-0.0.6/src/bulletmlparser-xerces.h
+===================================================================
+--- bulletml-0.0.6.orig/src/bulletmlparser-xerces.h 2007-08-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-xerces.h 2007-08-27 20:47:07.000000000 +0000
+@@ -8,18 +8,14 @@
+
+ #ifdef USE_XERCES
+
+-#include <string>
+-
+ class BulletMLParserXerces : public BulletMLParser {
+ public:
+- explicit BulletMLParserXerces(const std::string& filename);
++ explicit BulletMLParserXerces(const char* filename);
+ virtual ~BulletMLParserXerces();
+
+ virtual void parse();
+
+ private:
+- std::string xmlFile_;
+-
+ friend class BulletMLParserXercesSAXHandler;
+ };
+
+Index: bulletml-0.0.6/src/bulletmlparser-ygg.cpp
+===================================================================
+--- bulletml-0.0.6.orig/src/bulletmlparser-ygg.cpp 2007-08-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-ygg.cpp 2007-08-27 20:47:07.000000000 +0000
+@@ -63,8 +63,8 @@
+ curNode_->setValue(trimString(text.get_text()));
+ }
+
+-BulletMLParserYggdrasil::BulletMLParserYggdrasil(const std::string& filename)
+- : xmlFile_(filename), curNode_(0)
++BulletMLParserYggdrasil::BulletMLParserYggdrasil(const char* filename)
++ : curNode_(0)
+ {
+ setName(filename);
+ }
+@@ -72,7 +72,8 @@
+ BulletMLParserYggdrasil::~BulletMLParserYggdrasil() {}
+
+ void BulletMLParserYggdrasil::parse() {
+- sox_file(xmlFile_).read(this);
++ std::string f(name_);
++ sox_file(f).read(this);
+ }
+
+ 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-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-ygg.h 2007-08-27 20:47:07.000000000 +0000
+@@ -24,7 +24,7 @@
+ void catch_text(yggdrasil::ygg_node text);
+
+ public:
+- DECLSPEC explicit BulletMLParserYggdrasil(const std::string& filename);
++ DECLSPEC explicit BulletMLParserYggdrasil(const char* filename);
+ DECLSPEC virtual ~BulletMLParserYggdrasil();
+
+ DECLSPEC virtual void parse();
+@@ -33,7 +33,6 @@
+ std::string trimString(const std::string& str);
+
+ private:
+- std::string xmlFile_;
+ class BulletMLNode* curNode_;
+ };
+
+Index: bulletml-0.0.6/src/bulletmlrunnerimpl.cpp
+===================================================================
+--- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.cpp 2007-08-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlrunnerimpl.cpp 2007-08-27 20:47:07.000000000 +0000
+@@ -25,8 +25,7 @@
+ &BulletMLRunnerImpl::runVanish
+ };
+
+-double BulletMLRunnerImpl::getDirection(BulletMLNode* dirNode,
+- bool prevChange) {
++double BulletMLRunnerImpl::getDirection(BulletMLNode* dirNode) {
+ double dir;
+
+ bool isDefault = true;
+@@ -64,7 +63,7 @@
+ while (dir > 360) dir -= 360;
+ while (dir < 0) dir += 360;
+
+- if (prevChange) prevDir_ = dir;
++ prevDir_ = dir;
+
+ return dir;
+ }
+@@ -119,12 +118,7 @@
+ act_ = node_[0];
+ }
+
+-BulletMLRunnerImpl::~BulletMLRunnerImpl() {
+- while (!repeatStack_.empty()) {
+- delete repeatStack_.top();
+- repeatStack_.pop();
+- }
+-}
++BulletMLRunnerImpl::~BulletMLRunnerImpl() {}
+
+ double BulletMLRunnerImpl::getNumberContents(const BulletMLNode* node) {
+ assert(node);
+@@ -404,7 +398,7 @@
+ BulletMLNode::Type type = dirNode->getType();
+
+ double dir;
+- if (type != BulletMLNode::sequence) dir = getDirection(dirNode, false);
++ if (type != BulletMLNode::sequence) dir = getDirection(dirNode);
+ 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-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlrunnerimpl.h 2007-08-27 20:47:07.000000000 +0000
+@@ -136,7 +136,7 @@
+ double getNumberContents(const BulletMLNode* node);
+ std::vector<double>* getParameters();
+ double getSpeed(BulletMLNode* spdNode);
+- double getDirection(BulletMLNode* dirNode, bool prevChange = true);
++ double getDirection(BulletMLNode* dirNode);
+
+ private:
+ private:
+Index: bulletml-0.0.6/src/calc.cpp
+===================================================================
+--- bulletml-0.0.6.orig/src/calc.cpp 2007-08-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/calc.cpp 2007-08-27 20:47:07.000000000 +0000
+@@ -1017,9 +1017,9 @@
+
+
+ /**
+- * Žš‹å‰ðÍŠí‚ÍA”’l‚ð“Ç‚ß‚ÎAdoubleŒ^‚Ì’l‚ðƒXƒ^ƒbƒN‚ÉÏ‚ñ‚Å
+- * ƒg[ƒNƒ“uNUMv‚ð•Ô‚µA”’lˆÈŠO‚ð“Ç‚ß‚ÎA‚»‚Ì•¶Žš‚̃AƒXƒL[•„†‚ð•Ô‚·B
+- * ‹ó”’‚ƃ^ƒu‚Í“Ç‚Ý”ò‚΂³‚ê‚éBƒtƒ@ƒCƒ‹‚ªI‚í‚é‚Æ0‚ð•Ô‚·B
++ * »ú¶ç²òÀÏ´ï¤Ï¡¢¿ôÃͤòÆɤá¤Ð¡¢double·¿¤ÎÃͤò¥¹¥¿¥Ã¥¯¤ËÀѤó¤Ç
++ * ¥È¡¼¥¯¥ó¡ÖNUM¡×¤òÊÖ¤·¡¢¿ôÃͰʳ°¤òÆɤá¤Ð¡¢¤½¤Îʸ»ú¤Î¥¢¥¹¥¡¼Éä¹æ¤òÊÖ¤¹¡£
++ * ¶õÇò¤È¥¿¥Ö¤ÏÆɤßÈô¤Ð¤µ¤ì¤ë¡£¥Õ¥¡¥¤¥ë¤¬½ª¤ï¤ë¤È0¤òÊÖ¤¹¡£
+ */
+
+ #include <ctype.h>
+@@ -1029,10 +1029,10 @@
+ {
+ int c;
+
+- /* ‹ó”’—Þ‚ð“Ç‚Ý”ò‚΂· */
++ /* ¶õÇòÎà¤òÆɤßÈô¤Ð¤¹ */
+ while ((c = *(yyinStr++)) == ' ' || c == '\t')
+ ;
+- /* ”’l‚ðˆ—‚·‚é */
++ /* ¿ôÃͤò½èÍý¤¹¤ë */
+ if (c == '.' || isdigit (c))
+ {
+ yyinStr--;
+@@ -1041,7 +1041,7 @@
+ return NUM;
+ }
+
+- // •Ï”‚ðˆ—‚·‚é */
++ // ÊÑ¿ô¤ò½èÍý¤¹¤ë */
+ if (c == '$') {
+ if (strncmp(yyinStr, "rand", 4) == 0) {
+ yyinStr += 4;
+@@ -1059,10 +1059,10 @@
+ }
+ }
+
+- /* ƒtƒ@ƒCƒ‹‚ÌI‚í‚è‚ðˆ—‚·‚é */
++ /* ¥Õ¥¡¥¤¥ë¤Î½ª¤ï¤ê¤ò½èÍý¤¹¤ë */
+ if (c == '\0')
+ return 0;
+- /* 1•¶Žš‚ð•Ô‚· */
++ /* 1ʸ»ú¤òÊÖ¤¹ */
+ return c;
+ }
+
+Index: bulletml-0.0.6/src/Makefile
+===================================================================
+--- bulletml-0.0.6.orig/src/Makefile 2007-08-27 20:47:04.000000000 +0000
++++ bulletml-0.0.6/src/Makefile 2007-08-27 20:47:07.000000000 +0000
+@@ -1,27 +1,28 @@
+-CC = g++
+-INCLUDES = -I.
+-LIBS = tinyxml/tinyxml.o tinyxml/tinyxmlparser.o tinyxml/tinyxmlerror.o
+ #CXXFLAGS = -g -W -Wall -ansi -pedantic
+ #CXXFLAGS = -pg -g -W -Wall -ansi -pedantic
+-CXXFLAGS = -O2 -W -Wall -ansi -pedantic
++CXXFLAGS = -O2 -W -Wall -ansi -pedantic -I. -I../d_cpp
+ CFLAGS = -O2
+-OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o
++OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o \
++ formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o bulletml_d.o
+
+-all: libbulletml.a
++all: libbulletml_d.a
+
+-libbulletml.a: $(OBJS)
++libbulletml_d.a: ../bulletml.d $(OBJS)
+ $(MAKE) -C tinyxml
+- $(AR) -r libbulletml.a *.o tinyxml/tiny*.o
++ ar cru libbulletml_d.a *.o tinyxml/tiny*.o
++
++../bulletml.d: bulletml_d.cpp
++ perl ../d_cpp/create_d_import.pl bulletml_d.cpp bulletml.d
+
+ clean:
+- rm -f *.o *.a
++ rm -f *.o *.a test_bulletml
+ $(MAKE) -C tinyxml clean
+
+ calc.cpp: calc.yy
+ bison -y calc.yy && mv y.tab.c calc.cpp
+
+ $(OBJS): %.o: %.cpp
+- $(CC) -c $(CXXFLAGS) $(INCLUDES) $<
++ $(CXX) -c $(CXXFLAGS) $(INCLUDES) $<
+
+ doxy:
+ doxygen
Added: packages/trunk/bulletml/debian/patches/series
===================================================================
--- packages/trunk/bulletml/debian/patches/series (rev 0)
+++ packages/trunk/bulletml/debian/patches/series 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,3 @@
+fixes.patch
+bulletml_d.patch
+d_cpp.patch
Added: packages/trunk/bulletml/debian/rules
===================================================================
--- packages/trunk/bulletml/debian/rules (rev 0)
+++ packages/trunk/bulletml/debian/rules 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,84 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ $(MAKE) -f /usr/share/quilt/quilt.make patch
+ touch $@
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) -C src
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) -C src clean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_install
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+get-orig-source:
+ wget http://shinh.skr.jp/libbulletml/libbulletml-0.0.6.tar.bz2
+ wget http://shinh.skr.jp/d/d_cpp.tar.bz2
+ tar xvfj libbulletml-0.0.6.tar.bz2
+ cd bulletml && tar xvfj ../d_cpp.tar.bz2
+ rm -rf bulletml/src/boost/
+ tar cvfz ../bulletml_0.0.6.orig.tar.gz bulletml
+ rm -r bulletml
+ rm d_cpp.tar.bz2 libbulletml-0.0.6.tar.bz2
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source
Property changes on: packages/trunk/bulletml/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/trunk/bulletml/debian/shlibs.local.ex
===================================================================
--- packages/trunk/bulletml/debian/shlibs.local.ex (rev 0)
+++ packages/trunk/bulletml/debian/shlibs.local.ex 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1 @@
+libbulletml 0.0.6 bulletml (>> 0.0.6-0), bulletml (<< 0.0.6-99)
Added: packages/trunk/bulletml/debian/watch.ex
===================================================================
--- packages/trunk/bulletml/debian/watch.ex (rev 0)
+++ packages/trunk/bulletml/debian/watch.ex 2007-08-27 20:59:29 UTC (rev 3895)
@@ -0,0 +1,22 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php bulletml-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/bulletml-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/bulletml-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for devscripts >= 2.9
+# http://sf.net/bulletml/bulletml-(.*)\.tar\.gz
+
+
More information about the Pkg-games-commits
mailing list