[SCM] Packaging for grhino branch, master, updated. debian/0.16.0-5-6-g10f6f8e

[Vincent Legout]

The following commit has been merged in the master branch:
commit bbcab68b7ac720338b09b40bfa379a135e2fc065
Author: Vincent Legout <vincent at legout.info>
Date:   Sat Dec 4 21:12:27 2010 +0100

    Remove merged patches

diff --git a/debian/changelog b/debian/changelog
index 715b0b5..457298e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grhino (0.16.1-1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - 02_gcc_4_3.diff, 03_desktop_file.diff: Removed, merged upstream
+
+ -- Vincent Legout <vincent at legout.info>  Sat, 04 Dec 2010 21:09:28 +0100
+
 grhino (0.16.0-5) unstable; urgency=low
 
   * grhino-data conflicts with grhino << 0.16.0-4 (Closes: #561523)
diff --git a/debian/patches/02_gcc_4_3.diff b/debian/patches/02_gcc_4_3.diff
deleted file mode 100644
index e48a2a1..0000000
--- a/debian/patches/02_gcc_4_3.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-# Description: Fix FTBFS with GCC 4.3
-# Author: Martin Michlmayr <tbm at cyrius.com>
-# Bug-Debian: http://bugs.debian.org/417215
-
-Index: grhino/book.cc
-===================================================================
---- grhino.orig/book.cc	2009-12-31 15:58:08.561137506 +0100
-+++ grhino/book.cc	2009-12-31 15:58:16.717137812 +0100
-@@ -25,6 +25,7 @@
- #include "rand.h"
- #include "gtstream.h"
- 
-+#include <cstdlib>
- #include <vector>
- #include <iostream>
- #include <stdexcept>
-Index: grhino/game.cc
-===================================================================
---- grhino.orig/game.cc	2009-12-31 15:58:22.497138852 +0100
-+++ grhino/game.cc	2009-12-31 15:58:29.381147547 +0100
-@@ -33,6 +33,7 @@
- #include "fdstream.h"
- #include "boardio.h"
- 
-+#include <cstdlib>
- #include <sys/types.h>
- #include <sys/stat.h> 
- #include <unistd.h>
-Index: grhino/log_proc.h
-===================================================================
---- grhino.orig/log_proc.h	2009-12-31 15:58:35.381136372 +0100
-+++ grhino/log_proc.h	2009-12-31 15:58:43.349152965 +0100
-@@ -20,6 +20,7 @@
- 
- #include "config.h"
- 
-+#include <cstdlib>
- #include <exception>
- #include <stdexcept>
- #include <string>
diff --git a/debian/patches/03_desktop_file.diff b/debian/patches/03_desktop_file.diff
deleted file mode 100644
index 7591d3e..0000000
--- a/debian/patches/03_desktop_file.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-# Description: Remove Encoding field in grhino.desktop
-# Author: Vincent Legout <vincent at legout.info>
-
-Index: grhino/desktop/grhino.desktop.in
-===================================================================
---- grhino.orig/desktop/grhino.desktop.in	2009-12-31 15:59:08.013136986 +0100
-+++ grhino/desktop/grhino.desktop.in	2009-12-31 15:59:09.465138410 +0100
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=GRhino
- GenericName=GTP-compliant Reversi game
- Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
diff --git a/debian/patches/series b/debian/patches/series
index 3252275..eec3602 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 01_dirname_no_version.diff
-02_gcc_4_3.diff
-03_desktop_file.diff

-- 
Packaging for grhino