r5163 - in packages/trunk/bulletml/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2008-01-02 21:04:58 +0000 (Wed, 02 Jan 2008)
New Revision: 5163

Modified:
   packages/trunk/bulletml/debian/patches/fixes.patch
   packages/trunk/bulletml/debian/rules
Log:
bulletml: delete calc.cpp to ensure it gets regenerated from calc.yy


Modified: packages/trunk/bulletml/debian/patches/fixes.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/fixes.patch	2008-01-02 12:30:46 UTC (rev 5162)
+++ packages/trunk/bulletml/debian/patches/fixes.patch	2008-01-02 21:04:58 UTC (rev 5163)
@@ -235,55 +235,3 @@
  
  private:
  private:
-Index: bulletml-0.0.6/src/calc.cpp
-===================================================================
---- 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 @@
- 
- 
- /**
-- * Žš‹å‰ðÍŠí‚́A”’l‚ð“ǂ߂΁AdoubleŒ^‚Ì’l‚ðƒXƒ^ƒbƒN‚ɐςñ‚Å
-- * ƒg[ƒNƒ“uNUMv‚ð•Ô‚µ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;
- }
- 

Modified: packages/trunk/bulletml/debian/rules
===================================================================
--- packages/trunk/bulletml/debian/rules	2008-01-02 12:30:46 UTC (rev 5162)
+++ packages/trunk/bulletml/debian/rules	2008-01-02 21:04:58 UTC (rev 5163)
@@ -24,6 +24,7 @@
 configure-stamp:
 	dh_testdir
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
+	rm -f src/calc.cpp #needs to be regenerated from src/calc.yy
 	touch $@
 
 build: build-stamp
@@ -43,6 +44,7 @@
 	$(MAKE) -C src clean
 	rm -f src/*.so src/*.so.* src/*.o
 	rm -f src/bulletml.d
+	rm -f src/calc.cpp
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean