[blockattack] 53/88: Drop several patches no longer useful or included upstream

Markus Koschany apo-guest at moszumanska.debian.org
Wed Jan 6 11:53:28 UTC 2016


This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository blockattack.

commit dc4eb580d8e14fd7913d367543abea4d3fa8c503
Author: Paul Wise <pabs at debian.org>
Date:   Thu Mar 10 08:31:00 2011 +0000

    Drop several patches no longer useful or included upstream
---
 debian/changelog                 |  1 +
 debian/patches/desktop_file.diff | 10 ----------
 debian/patches/fix_scons.diff    | 17 -----------------
 debian/patches/fix_spelling.diff | 13 -------------
 debian/patches/replay_init.diff  | 22 ----------------------
 debian/patches/scons_args.diff   |  9 ---------
 debian/patches/series            |  5 -----
 7 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6641b94..7dd566b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ blockattack (1.4.1-1) UNRELEASED; urgency=low
 
   * 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
diff --git a/debian/patches/desktop_file.diff b/debian/patches/desktop_file.diff
deleted file mode 100644
index 2af5d3a..0000000
--- a/debian/patches/desktop_file.diff
+++ /dev/null
@@ -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
diff --git a/debian/patches/fix_scons.diff b/debian/patches/fix_scons.diff
deleted file mode 100644
index 4fb9af4..0000000
--- a/debian/patches/fix_scons.diff
+++ /dev/null
@@ -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',
diff --git a/debian/patches/fix_spelling.diff b/debian/patches/fix_spelling.diff
deleted file mode 100644
index 519e57b..0000000
--- a/debian/patches/fix_spelling.diff
+++ /dev/null
@@ -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
diff --git a/debian/patches/replay_init.diff b/debian/patches/replay_init.diff
deleted file mode 100644
index 73231b0..0000000
--- a/debian/patches/replay_init.diff
+++ /dev/null
@@ -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
diff --git a/debian/patches/scons_args.diff b/debian/patches/scons_args.diff
deleted file mode 100644
index 6b692c6..0000000
--- a/debian/patches/scons_args.diff
+++ /dev/null
@@ -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')
diff --git a/debian/patches/series b/debian/patches/series
index 970c440..b79e912 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-scons_args.diff
-fix_scons.diff
-fix_spelling.diff
-replay_init.diff
-desktop_file.diff
 gcc44.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/blockattack.git



More information about the Pkg-games-commits mailing list