r3905 - packages/trunk/bulletml/debian/patches
Miriam Ruiz
baby-guest at alioth.debian.org
Tue Aug 28 11:44:17 UTC 2007
Author: baby-guest
Date: 2007-08-28 11:44:16 +0000 (Tue, 28 Aug 2007)
New Revision: 3905
Added:
packages/trunk/bulletml/debian/patches/makefile.patch
Modified:
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/patches/warnings.patch
Log:
Fix patches
Modified: packages/trunk/bulletml/debian/patches/bulletml_d.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/bulletml_d.patch 2007-08-28 11:39:17 UTC (rev 3904)
+++ packages/trunk/bulletml/debian/patches/bulletml_d.patch 2007-08-28 11:44:16 UTC (rev 3905)
@@ -1,7 +1,7 @@
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
++++ bulletml-0.0.6/src/bulletml_d.cpp 2007-08-28 11:43:24.000000000 +0000
@@ -0,0 +1,92 @@
+#include "d_cpp_interface.h"
+
Modified: packages/trunk/bulletml/debian/patches/d_cpp.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/d_cpp.patch 2007-08-28 11:39:17 UTC (rev 3904)
+++ packages/trunk/bulletml/debian/patches/d_cpp.patch 2007-08-28 11:44:16 UTC (rev 3905)
@@ -1,7 +1,7 @@
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
+--- bulletml-0.0.6.orig/d_cpp/d_cpp_interface.h 2007-08-28 11:41:01.000000000 +0000
++++ bulletml-0.0.6/d_cpp/d_cpp_interface.h 2007-08-28 11:43:24.000000000 +0000
@@ -1,4 +1,4 @@
-#define D_CPP_CLASS(CLASS, CLASS_NAME) ;
+#define D_CPP_CLASS(CLASS, CLASS_NAME)
Modified: packages/trunk/bulletml/debian/patches/fixes.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/fixes.patch 2007-08-28 11:39:17 UTC (rev 3904)
+++ packages/trunk/bulletml/debian/patches/fixes.patch 2007-08-28 11:44:16 UTC (rev 3905)
@@ -1,7 +1,7 @@
Index: bulletml-0.0.6/src/bulletmlparser.h
===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser.h 2007-08-28 11:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser.h 2007-08-28 11:37:23.000000000 +0000
+--- 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
@@ -70,11 +70,10 @@
bool isHorizontal_;
@@ -19,8 +19,8 @@
Index: bulletml-0.0.6/src/bulletmlparser-tinyxml.cpp
===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.cpp 2007-08-28 11:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-tinyxml.cpp 2007-08-28 11:37:23.000000000 +0000
+--- 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
@@ -5,8 +5,8 @@
#include <string>
@@ -43,8 +43,8 @@
}
Index: bulletml-0.0.6/src/bulletmlparser-tinyxml.h
===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.h 2007-08-28 11:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-tinyxml.h 2007-08-28 11:37:23.000000000 +0000
+--- 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
@@ -16,12 +16,12 @@
class BulletMLParserTinyXML : public BulletMLParser {
@@ -70,8 +70,8 @@
Index: bulletml-0.0.6/src/bulletmlparser-xerces.cpp
===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-xerces.cpp 2007-08-28 11:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-xerces.cpp 2007-08-28 11:37:23.000000000 +0000
+--- 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
@@ -19,9 +19,9 @@
BulletMLParserXercesSAXHandler(BulletMLParserXerces* parser);
@@ -105,8 +105,8 @@
}
Index: bulletml-0.0.6/src/bulletmlparser-xerces.h
===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-xerces.h 2007-08-28 11:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-xerces.h 2007-08-28 11:37:23.000000000 +0000
+--- 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
@@ -8,18 +8,14 @@
#ifdef USE_XERCES
@@ -129,8 +129,8 @@
Index: bulletml-0.0.6/src/bulletmlparser-ygg.cpp
===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-ygg.cpp 2007-08-28 11:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-ygg.cpp 2007-08-28 11:37:23.000000000 +0000
+--- 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
@@ -63,8 +63,8 @@
curNode_->setValue(trimString(text.get_text()));
}
@@ -154,8 +154,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:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-ygg.h 2007-08-28 11:37:23.000000000 +0000
+--- 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
@@ -24,7 +24,7 @@
void catch_text(yggdrasil::ygg_node text);
@@ -175,8 +175,8 @@
Index: bulletml-0.0.6/src/bulletmlrunnerimpl.cpp
===================================================================
---- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.cpp 2007-08-28 11:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlrunnerimpl.cpp 2007-08-28 11:37:23.000000000 +0000
+--- 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
@@ -25,8 +25,7 @@
&BulletMLRunnerImpl::runVanish
};
@@ -221,8 +221,8 @@
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:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlrunnerimpl.h 2007-08-28 11:37:23.000000000 +0000
+--- 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
@@ -136,7 +136,7 @@
double getNumberContents(const BulletMLNode* node);
std::vector<double>* getParameters();
@@ -234,8 +234,8 @@
private:
Index: bulletml-0.0.6/src/calc.cpp
===================================================================
---- bulletml-0.0.6.orig/src/calc.cpp 2007-08-28 11:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/calc.cpp 2007-08-28 11:37:23.000000000 +0000
+--- bulletml-0.0.6.orig/src/calc.cpp 2007-08-28 11:41:01.000000000 +0000
++++ bulletml-0.0.6/src/calc.cpp 2007-08-28 11:43:23.000000000 +0000
@@ -1017,9 +1017,9 @@
@@ -284,63 +284,3 @@
return c;
}
-Index: bulletml-0.0.6/src/Makefile
-===================================================================
---- bulletml-0.0.6.orig/src/Makefile 2007-08-28 11:37:20.000000000 +0000
-+++ bulletml-0.0.6/src/Makefile 2007-08-28 11:37:52.000000000 +0000
-@@ -1,27 +1,46 @@
--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 -I. -I../d_cpp
- CXXFLAGS = -O2 -W -Wall -ansi -pedantic
- CFLAGS = -O2
--OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o
-+LDFLAGS=
-+INCLUDES= -I. -I../d_cpp
-+OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o \
-+ formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o bulletml_d.o
-+
-+MAJOR=0d1
-+MINOR=0
-+
-+all: libbulletml_d.a libbulletml_d.so
-+
-+libbulletml_d.so: tinyxml/tinyxml.o ../bulletml.d $(OBJS)
-+ $(CXX) $(LDFLAGS) -shared \
-+ -Wl,-soname,libfoo.so.$(MAJOR) \
-+ -o libbulletml_d.so.$(MAJOR).$(MINOR) \
-+ *.o tinyxml/tiny*.o
-+ rm -f libbulletml_d.so.$(MAJOR)
-+ ln -s libbulletml_d.so.$(MAJOR).$(MINOR) libbulletml_d.so.$(MAJOR)
-+ rm -f libbulletml_d.so
-+ ln -s libbulletml_d.so.$(MAJOR) libbulletml_d.so
-
--all: libbulletml.a
-+libbulletml_d.a: tinyxml/tinyxml.o ../bulletml.d $(OBJS)
-+ ar cru libbulletml_d.a *.o tinyxml/tiny*.o
-
--libbulletml.a: $(OBJS)
-+../bulletml.d: bulletml_d.cpp
-+ perl ../d_cpp/create_d_import.pl bulletml_d.cpp bulletml.d
-+
-+tinyxml/tinyxml.o:
- $(MAKE) -C tinyxml
-- $(AR) -r libbulletml.a *.o tinyxml/tiny*.o
-
- clean:
-- rm -f *.o *.a
-+ rm -f *.o *.a test_bulletml *.so *.so.*
- $(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/makefile.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/makefile.patch (rev 0)
+++ packages/trunk/bulletml/debian/patches/makefile.patch 2007-08-28 11:44:16 UTC (rev 3905)
@@ -0,0 +1,60 @@
+Index: bulletml-0.0.6/src/Makefile
+===================================================================
+--- bulletml-0.0.6.orig/src/Makefile 2007-08-28 11:41:02.000000000 +0000
++++ bulletml-0.0.6/src/Makefile 2007-08-28 11:43:25.000000000 +0000
+@@ -1,27 +1,46 @@
+-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 -I. -I../d_cpp
+ CXXFLAGS = -O2 -W -Wall -ansi -pedantic
+ CFLAGS = -O2
+-OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o
++LDFLAGS=
++INCLUDES= -I. -I../d_cpp
++OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o \
++ formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o bulletml_d.o
++
++MAJOR=0d1
++MINOR=0
++
++all: libbulletml_d.a libbulletml_d.so
++
++libbulletml_d.so: tinyxml/tinyxml.o ../bulletml.d $(OBJS)
++ $(CXX) $(LDFLAGS) -shared \
++ -Wl,-soname,libfoo.so.$(MAJOR) \
++ -o libbulletml_d.so.$(MAJOR).$(MINOR) \
++ *.o tinyxml/tiny*.o
++ rm -f libbulletml_d.so.$(MAJOR)
++ ln -s libbulletml_d.so.$(MAJOR).$(MINOR) libbulletml_d.so.$(MAJOR)
++ rm -f libbulletml_d.so
++ ln -s libbulletml_d.so.$(MAJOR) libbulletml_d.so
+
+-all: libbulletml.a
++libbulletml_d.a: tinyxml/tinyxml.o ../bulletml.d $(OBJS)
++ ar cru libbulletml_d.a *.o tinyxml/tiny*.o
+
+-libbulletml.a: $(OBJS)
++../bulletml.d: bulletml_d.cpp
++ perl ../d_cpp/create_d_import.pl bulletml_d.cpp bulletml.d
++
++tinyxml/tinyxml.o:
+ $(MAKE) -C tinyxml
+- $(AR) -r libbulletml.a *.o tinyxml/tiny*.o
+
+ clean:
+- rm -f *.o *.a
++ rm -f *.o *.a test_bulletml *.so *.so.*
+ $(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
Modified: packages/trunk/bulletml/debian/patches/series
===================================================================
--- packages/trunk/bulletml/debian/patches/series 2007-08-28 11:39:17 UTC (rev 3904)
+++ packages/trunk/bulletml/debian/patches/series 2007-08-28 11:44:16 UTC (rev 3905)
@@ -2,3 +2,4 @@
bulletml_d.patch
d_cpp.patch
warnings.patch
+makefile.patch
Modified: packages/trunk/bulletml/debian/patches/warnings.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/warnings.patch 2007-08-28 11:39:17 UTC (rev 3904)
+++ packages/trunk/bulletml/debian/patches/warnings.patch 2007-08-28 11:44:16 UTC (rev 3905)
@@ -1,7 +1,7 @@
Index: bulletml-0.0.6/src/bulletmlrunnerimpl.cpp
===================================================================
---- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.cpp 2007-08-28 09:45:38.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlrunnerimpl.cpp 2007-08-28 09:48:44.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.cpp 2007-08-28 11:43:23.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlrunnerimpl.cpp 2007-08-28 11:43:25.000000000 +0000
@@ -467,7 +467,7 @@
double dirSpace2;
if (dirSpace1 > 0) dirSpace2 = dirSpace1 - 360;
@@ -13,8 +13,8 @@
auto_ptr_copy(changeDir_, new LinearFunc<int, double>
Index: bulletml-0.0.6/src/formula-variables.h
===================================================================
---- bulletml-0.0.6.orig/src/formula-variables.h 2007-08-28 09:45:50.000000000 +0000
-+++ bulletml-0.0.6/src/formula-variables.h 2007-08-28 09:50:53.000000000 +0000
+--- bulletml-0.0.6.orig/src/formula-variables.h 2007-08-28 11:41:01.000000000 +0000
++++ bulletml-0.0.6/src/formula-variables.h 2007-08-28 11:43:25.000000000 +0000
@@ -33,7 +33,7 @@
template <typename Val_>
class Param : public AbstractNumber<Val_> {
More information about the Pkg-games-commits
mailing list