SOURCES: wormux-desktop.patch, wormux-disable-werror.patch - move to MAIN b...

[lisu]

Author: lisu                         Date: Sat Jun 21 20:56:53 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- move to MAIN branch

---- Files affected:
SOURCES:
   wormux-desktop.patch (1.2 -> 1.3) , wormux-disable-werror.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/wormux-desktop.patch
diff -u SOURCES/wormux-desktop.patch:1.2 SOURCES/wormux-desktop.patch:1.3
--- SOURCES/wormux-desktop.patch:1.2	Thu Apr  5 13:15:07 2007
+++ SOURCES/wormux-desktop.patch	Sat Jun 21 22:56:47 2008
@@ -1,5 +1,5 @@
---- wormux-0.7.9/data/wormux.desktop~	2007-01-28 15:06:10.000000000 +0100
-+++ wormux-0.7.9/data/wormux.desktop	2007-02-11 14:06:58.000000000 +0100
+--- wormux-0.8beta3/data/wormux.desktop	2007-11-11 00:40:53.000000000 +0000
++++ wormux-0.8beta3/data/wormux.desktop	2007-11-29 11:45:24.000000000 +0000
 @@ -2,7 +2,7 @@
  Version=1.0
  Encoding=UTF-8
@@ -9,18 +9,12 @@
  Exec=wormux
  Terminal=false
  StartupNotify=false
-@@ -12,9 +12,10 @@
+@@ -13,7 +13,7 @@
  Comment=A 2D game where funny characters launch funny weapons
  Comment[de]=Ein 2D Spiel mit lustigen Figuren und Waffen
  Comment[es]=Un juego en 2D donde extraños personajes se destripan con alegría
 -Comment[fr_FR]=Un jeu en 2D où de drôles de personnages s'étripent joyeusement
 +Comment[fr]=Un jeu en 2D où de drôles de personnages s'étripent joyeusement
  Comment[it]=Un gioco in 2D dove dei simpatici personaggi si sparano allegramente
--Comment[pl_PL]=Gra 2D, w ktorej smieszne postacie uzywaja smiesznych typow broni
--Comment[ro_RO]=Un joc în 2D în care personaje amuzante lansează arme amuzante
-+Comment[pl]=Gra 2D, w której śmieszne postacie używają śmiesznych typów broni
-+Comment[ro]=Un joc în 2D în care personaje amuzante lansează arme amuzante
- 
--Categories=Application;Game;ArcadeGame
-+Categories=Game;ArcadeGame;
-+# vi: encoding=utf-8
+ Comment[pl]=Gra 2D, w której zabawne postacie używają zabawnego uzbojenia
+ Comment[ro]=Un joc în 2D în care personaje amuzante lansează arme amuzante

================================================================
Index: SOURCES/wormux-disable-werror.patch
diff -u SOURCES/wormux-disable-werror.patch:1.1 SOURCES/wormux-disable-werror.patch:1.2
--- SOURCES/wormux-disable-werror.patch:1.1	Fri Feb  9 11:43:19 2007
+++ SOURCES/wormux-disable-werror.patch	Sat Jun 21 22:56:48 2008
@@ -1,11 +1,9 @@
---- wormux-0.7.9/src/Makefile.am.orig	2007-02-09 01:27:53.169072787 +0100
-+++ wormux-0.7.9/src/Makefile.am	2007-02-09 01:28:00.297479010 +0100
-@@ -176,7 +176,7 @@
- 	weapon/blowtorch.cpp weapon/blowtorch.h \
- 	weapon/syringe.cpp weapon/syringe.h
- 
--AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror
-+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
- 
- 
- if WIN32
+--- wormux-0.8beta2/src/Makefile.am	2007-09-11 23:56:49.000000000 +0000
++++ wormux-0.8beta2/src/Makefile.am	2007-09-12 00:01:23.000000000 +0000
+@@ -203,6 +203,4 @@
+ wormux_SOURCES += wormux.rc wormux.ico
+ .rc.o:
+ 	@WINDRES@ -o $@ -i $<
+-else
+-AM_CXXFLAGS += -Werror
+ endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/wormux-desktop.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/wormux-disable-werror.patch?r1=1.1&r2=1.2&f=u