[chocolate-doom] 01/02: Remove all patches, applied upstream

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository chocolate-doom.

commit 2d20d1cec0348d91aa05edebc197ffbbd4710d69
Author: Fabian Greffrath <fabian at debian.org>
Date:   Fri Jun 12 14:59:02 2015 +0200

    Remove all patches, applied upstream
---
 debian/changelog                                   |  3 ++-
 .../0001-man-Use-to-denote-dashes.-Fixes-512.patch | 25 ----------------------
 ...an-fix-one-last-hyphen-used-as-minus-sign.patch | 25 ----------------------
 ...x-the-very-last-hyphen-used-as-minus-sign.patch | 25 ----------------------
 debian/patches/series                              |  3 ---
 5 files changed, 2 insertions(+), 79 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c1b82c..2e18a9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ chocolate-doom (2.2.0-1) unstable; urgency=medium
       considered GPL3 (Closes: #785122).
       - Update debian/copyright accordingly.
   * Update debian/watch to directly watch the github project page.
+  * Remove all patches, applied upstream.
 
- -- Fabian Greffrath <fabian at debian.org>  Fri, 12 Jun 2015 14:57:18 +0200
+ -- Fabian Greffrath <fabian at debian.org>  Fri, 12 Jun 2015 14:58:28 +0200
 
 chocolate-doom (2.1.0-2) unstable; urgency=medium
 
diff --git a/debian/patches/0001-man-Use-to-denote-dashes.-Fixes-512.patch b/debian/patches/0001-man-Use-to-denote-dashes.-Fixes-512.patch
deleted file mode 100644
index 32308e5..0000000
--- a/debian/patches/0001-man-Use-to-denote-dashes.-Fixes-512.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ad027ef6dbfeebabe0e6701eec968e9d474e497f Mon Sep 17 00:00:00 2001
-From: Mike Swanson <mikeonthecomputer at gmail.com>
-Date: Wed, 25 Mar 2015 16:06:11 -0700
-Subject: [PATCH] man: Use \- to denote dashes. Fixes #512
-
----
- man/docgen | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/man/docgen b/man/docgen
-index d9535be..3b11ad8 100755
---- a/man/docgen
-+++ b/man/docgen
-@@ -425,6 +425,8 @@ def manpage_output(targets, template_file):
-     for t in targets:
-         content += t.manpage_output() + "\n"
- 
-+    content = content.replace("-", "\\-")
-+
-     print_template(template_file, content)
- 
- def wiki_output(targets, template):
--- 
-2.1.4
-
diff --git a/debian/patches/0001-man-fix-one-last-hyphen-used-as-minus-sign.patch b/debian/patches/0001-man-fix-one-last-hyphen-used-as-minus-sign.patch
deleted file mode 100644
index efe557d..0000000
--- a/debian/patches/0001-man-fix-one-last-hyphen-used-as-minus-sign.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d5fe304162c433dabdbf12abb6e174d6466bbd2b Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian at greffrath.com>
-Date: Fri, 1 May 2015 13:50:45 +0200
-Subject: [PATCH] man: fix one last hyphen used as minus sign
-
----
- man/environ.man | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/environ.man b/man/environ.man
-index 502e965..171b25d 100644
---- a/man/environ.man
-+++ b/man/environ.man
-@@ -1,7 +1,7 @@
- .TP
- \fBDOOMWADDIR\fR, \fBDOOMWADPATH\fR
- These environment variables provide paths to search for Doom .WAD files when
--looking for a game IWAD file or a PWAD file specified with the `-file' option.
-+looking for a game IWAD file or a PWAD file specified with the `\-file' option.
- \fBDOOMWADDIR\fR specifies a single path in which to look for WAD files,
- while \fBDOOMWWADPATH\fR specifies a colon-separated list of paths to search.
- .TP
--- 
-2.1.4
-
diff --git a/debian/patches/0001-man-fix-the-very-last-hyphen-used-as-minus-sign.patch b/debian/patches/0001-man-fix-the-very-last-hyphen-used-as-minus-sign.patch
deleted file mode 100644
index 13237fe..0000000
--- a/debian/patches/0001-man-fix-the-very-last-hyphen-used-as-minus-sign.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4ee95eb27f4a71f78450d492a62e5abcd881c5c4 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian at greffrath.com>
-Date: Fri, 1 May 2015 13:54:36 +0200
-Subject: [PATCH] man: fix the very last hyphen used as minus sign
-
----
- man/chocolate-server.6 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/chocolate-server.6 b/man/chocolate-server.6
-index f37173f..74dc6f4 100644
---- a/man/chocolate-server.6
-+++ b/man/chocolate-server.6
-@@ -13,7 +13,7 @@ as similar to the original doom game as is possible.
- is a dedicated server for Chocolate Doom. It is equivalent to 
- running 
- .B chocolate\-doom
--with the "-dedicated" option.
-+with the "\-dedicated" option.
- .PP
- Game options are not specified to the server, which merely acts to
- retransmit data between players in the game; parameters for the
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 466351e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-man-Use-to-denote-dashes.-Fixes-512.patch
-0001-man-fix-one-last-hyphen-used-as-minus-sign.patch
-0001-man-fix-the-very-last-hyphen-used-as-minus-sign.patch

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