r11873 - in packages/trunk/blockattack/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-03-10 08:31:00 +0000 (Thu, 10 Mar 2011)
New Revision: 11873

Removed:
   packages/trunk/blockattack/debian/patches/desktop_file.diff
   packages/trunk/blockattack/debian/patches/fix_scons.diff
   packages/trunk/blockattack/debian/patches/fix_spelling.diff
   packages/trunk/blockattack/debian/patches/replay_init.diff
   packages/trunk/blockattack/debian/patches/scons_args.diff
Modified:
   packages/trunk/blockattack/debian/changelog
   packages/trunk/blockattack/debian/patches/series
Log:
Drop several patches no longer useful or included upstream

Modified: packages/trunk/blockattack/debian/changelog
===================================================================
--- packages/trunk/blockattack/debian/changelog	2011-03-10 07:37:31 UTC (rev 11872)
+++ packages/trunk/blockattack/debian/changelog	2011-03-10 08:31:00 UTC (rev 11873)
@@ -2,6 +2,7 @@
 
   * Team upload.
   * New upstream release
+    - Drop several patches no longer useful or included upstream
   * Clean up watch file
 
  -- Paul Wise <pabs at debian.org>  Thu, 10 Mar 2011 15:33:15 +0800

Deleted: packages/trunk/blockattack/debian/patches/desktop_file.diff
===================================================================
--- packages/trunk/blockattack/debian/patches/desktop_file.diff	2011-03-10 07:37:31 UTC (rev 11872)
+++ packages/trunk/blockattack/debian/patches/desktop_file.diff	2011-03-10 08:31:00 UTC (rev 11873)
@@ -1,10 +0,0 @@
-Index: blockattack-1.3.1/blockattack.desktop
-===================================================================
---- blockattack-1.3.1.orig/blockattack.desktop	2007-10-01 22:15:33.000000000 +0000
-+++ blockattack-1.3.1/blockattack.desktop	2007-10-01 22:16:00.000000000 +0000
-@@ -11,4 +11,4 @@
- Icon=blockattack32
- Terminal=false
- Type=Application
--Categories=Application;Game;ArcadeGame
-+Categories=Game;ArcadeGame

Deleted: packages/trunk/blockattack/debian/patches/fix_scons.diff
===================================================================
--- packages/trunk/blockattack/debian/patches/fix_scons.diff	2011-03-10 07:37:31 UTC (rev 11872)
+++ packages/trunk/blockattack/debian/patches/fix_scons.diff	2011-03-10 08:31:00 UTC (rev 11873)
@@ -1,17 +0,0 @@
-Index: blockattack-1.3.1/Game/SConscript
-===================================================================
---- blockattack-1.3.1.orig/Game/SConscript	2007-03-28 00:27:40.000000000 +0200
-+++ blockattack-1.3.1/Game/SConscript	2007-03-28 00:29:31.000000000 +0200
-@@ -125,9 +125,9 @@
- 'gfx/bChange.png',
- 'gfx/Thumbs.db',
- 'gfx/bHost.png',
--'gfx/b1600.png',
--'gfx/b1400.png',
--'gfx/b1280.png',
-+#'gfx/b1600.png',
-+#'gfx/b1400.png',
-+#'gfx/b1280.png',
- 'gfx/iCheckBoxArea2.png',
- 'gfx/blackLine.png',
- 'gfx/b1024.png',

Deleted: packages/trunk/blockattack/debian/patches/fix_spelling.diff
===================================================================
--- packages/trunk/blockattack/debian/patches/fix_spelling.diff	2011-03-10 07:37:31 UTC (rev 11872)
+++ packages/trunk/blockattack/debian/patches/fix_spelling.diff	2011-03-10 08:31:00 UTC (rev 11873)
@@ -1,13 +0,0 @@
-Index: blockattack-1.3.1/main.cpp
-===================================================================
---- blockattack-1.3.1.orig/main.cpp	2007-03-28 00:34:07.000000000 +0200
-+++ blockattack-1.3.1/main.cpp	2007-03-28 00:34:14.000000000 +0200
-@@ -2927,7 +2927,7 @@
-           endl << "-priority  Starts game in high priority" << endl <<
-           "-forceredraw  Redraw the whole screen every frame, prevents garbage" << endl <<
-           "-forcepartdraw  Only draw what is changed, sometimes cause garbage" << endl <<
--	  "-nosound  No sound will be played at all, and sound hardware want be loaded (use this if game crashes because of sound)" << endl;
-+	  "-nosound  No sound will be played at all, and sound hardware won't be loaded (use this if game crashes because of sound)" << endl;
- #ifdef WIN32
- 		  system("Pause");
- #endif

Deleted: packages/trunk/blockattack/debian/patches/replay_init.diff
===================================================================
--- packages/trunk/blockattack/debian/patches/replay_init.diff	2011-03-10 07:37:31 UTC (rev 11872)
+++ packages/trunk/blockattack/debian/patches/replay_init.diff	2011-03-10 08:31:00 UTC (rev 11873)
@@ -1,22 +0,0 @@
---- blockattack-1.3.1.orig/replay.cpp
-+++ blockattack-1.3.1/replay.cpp
-@@ -29,7 +29,7 @@
- 
- #include "replay.h"
- 
--void Replay::newReplay()
-+Replay::Replay()
- {
- 	nrOfFrames=0;
- }
---- blockattack-1.3.1.orig/replay.h
-+++ blockattack-1.3.1/replay.h
-@@ -66,7 +66,7 @@
-       enum { gameOver=0, winner, looser, draw } theResult;
-       
-       public:     
--      void newReplay(); //Constructor
-+      Replay(); //Constructor
-       Uint32 getNumberOfFrames(); //Returns number of frames
-       void setFrameSecTo(Uint32,boardPackage); //Sets frame at a given time to the package
-       void setFinalFrame(boardPackage,int); //Sets the final package

Deleted: packages/trunk/blockattack/debian/patches/scons_args.diff
===================================================================
--- packages/trunk/blockattack/debian/patches/scons_args.diff	2011-03-10 07:37:31 UTC (rev 11872)
+++ packages/trunk/blockattack/debian/patches/scons_args.diff	2011-03-10 08:31:00 UTC (rev 11873)
@@ -1,9 +0,0 @@
---- blockattack-1.3.1.orig/SConstruct
-+++ blockattack-1.3.1/SConstruct
-@@ -1,5 +1,5 @@
- # Option      #
--opts = Options(ARGUMENTS)
-+opts = Options(args = ARGUMENTS)
- opts.Add('destdir', 'Staging area to install BlockAttack to.  Useful for packagers.', '')
- opts.Add('prefix', 'Destination directory', '/usr/local')
- opts.Add('sharedir', 'Directory to use to store data file', '$prefix/share/blockattack')

Modified: packages/trunk/blockattack/debian/patches/series
===================================================================
--- packages/trunk/blockattack/debian/patches/series	2011-03-10 07:37:31 UTC (rev 11872)
+++ packages/trunk/blockattack/debian/patches/series	2011-03-10 08:31:00 UTC (rev 11873)
@@ -1,6 +1 @@
-scons_args.diff
-fix_scons.diff
-fix_spelling.diff
-replay_init.diff
-desktop_file.diff
 gcc44.diff