[SCM] KDE Games module packaging branch, master, updated. debian/4.7.4-3-4-g5f68b97

[Sune Vuorela]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdegames.git;a=commitdiff;h=e64a4c4

The following commit has been merged in the master branch:
commit e64a4c4f59a8dc2ac0dee72c3284b91791c0eda1
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sat Jun 16 22:37:55 2012 +0200

    remove upstream patch
---
 debian/changelog                      |    3 ++-
 debian/patches/series                 |    1 -
 debian/patches/upstream_r1286738.diff |   29 -----------------------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ec9dee..564e0fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdegames (4:4.8.4-0r1) UNRELEASED; urgency=low
 
-  * 
+  * New upstream release
+    - Upstream patch no longer needed
 
  -- Sune Vuorela <sune at debian.org>  Sat, 16 Jun 2012 22:30:55 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 45cf043..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_r1286738.diff
diff --git a/debian/patches/upstream_r1286738.diff b/debian/patches/upstream_r1286738.diff
deleted file mode 100644
index 60defeb..0000000
--- a/debian/patches/upstream_r1286738.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Christoph Feck <christoph at maxiom.de>
-Description: Compile with gcc 4.7
-Applied-Upstream: commit:1286738
-
-Index: kdegames/kblocks/KBlocksPlayNetwork.cpp
-===================================================================
---- kdegames/kblocks/KBlocksPlayNetwork.cpp	(revision 1286737)
-+++ kdegames/kblocks/KBlocksPlayNetwork.cpp	(revision 1286738)
-@@ -11,6 +11,8 @@
- 
- #ifdef Q_OS_WIN
- #include <windows.h>
-+#else
-+#include <unistd.h>
- #endif
- 
- KBlocksPlayNetwork::KBlocksPlayNetwork(int capacity, const string& serverIP, int localPort)
-Index: kdegames/kpat/patsolve/memory.h
-===================================================================
---- kdegames/kpat/patsolve/memory.h	(revision 1286737)
-+++ kdegames/kpat/patsolve/memory.h	(revision 1286738)
-@@ -19,6 +19,7 @@
- #ifndef MEMORY_H
- #define MEMORY_H
- 
-+#include <stdlib.h>
- #include <sys/types.h>
- 
- struct TREE;

-- 
KDE Games module packaging