[lgeneral] 05/12: Drop all patches. They were merged upstream.

[Markus Koschany]

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

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

commit a545f70f6f820e39c0f44e585090460cbb7a233f
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Mar 17 09:39:59 2015 +0100

    Drop all patches. They were merged upstream.
---
 debian/patches/desktop-file.patch    | 20 -------------------
 debian/patches/icon.patch            | 24 -----------------------
 debian/patches/remove-mapnames.patch | 38 ------------------------------------
 debian/patches/series                |  3 ---
 4 files changed, 85 deletions(-)

diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch
deleted file mode 100644
index 0ef2b8d..0000000
--- a/debian/patches/desktop-file.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Mon, 16 Jun 2014 11:09:18 +0200
-Subject: desktop file
-
-Forwarded: Michael Speck via private email
----
- lgeneral.desktop.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lgeneral.desktop.in b/lgeneral.desktop.in
-index b239090..7b8334a 100644
---- a/lgeneral.desktop.in
-+++ b/lgeneral.desktop.in
-@@ -4,4 +4,5 @@ Comment=LGeneral is a turn-based strategy engine heavily inspired by Panzer Gene
- Exec=lgeneral
- Icon=
- Type=Application
--Categories=Game;
-+Categories=Game;StrategyGame;
-+Keywords=turn-based;tiles;WWI;army;troops;battle;
diff --git a/debian/patches/icon.patch b/debian/patches/icon.patch
deleted file mode 100644
index a4c682e..0000000
--- a/debian/patches/icon.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Wed, 29 Oct 2014 20:12:45 +0100
-Subject: icon
-
-Fix path to menu icon.
-
-Forwarded: not-needed
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 778799d..582319a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -931,7 +931,7 @@ uninstall-am: uninstall-desktopDATA uninstall-iconDATA
- # the right way to handle it? At least it works... as long as $datadir
- # does not contain plus signs. :-)
- lgeneral.desktop:
--	@sed -e "s+Icon=+Icon=$(datadir)/icons/lgeneral48.png+" \
-+	@sed -e "s+Icon=+Icon=lgeneral+" \
- 	< lgeneral.desktop.in > lgeneral.desktop
- 
- package-translations:
diff --git a/debian/patches/remove-mapnames.patch b/debian/patches/remove-mapnames.patch
deleted file mode 100644
index 6555fb3..0000000
--- a/debian/patches/remove-mapnames.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Wed, 29 Oct 2014 20:57:54 +0100
-Subject: remove mapnames
-
-Exclude mapnames from build.
-
-Forwarded: not-needed
----
- lgc-pg/convdata/Makefile.am | 2 +-
- lgc-pg/convdata/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lgc-pg/convdata/Makefile.am b/lgc-pg/convdata/Makefile.am
-index 80186ee..b0cf9fc 100644
---- a/lgc-pg/convdata/Makefile.am
-+++ b/lgc-pg/convdata/Makefile.am
-@@ -3,7 +3,7 @@ convdata_DATA = \
- crosshair.bmp damage_bars.bmp fog.bmp grid.bmp select_frame.bmp \
- strength.bmp air2.wav air.wav leg.wav sea.wav wheeled.wav tracked.wav \
- battle.wav attack.bmp move.bmp select.wav reinf danger.bmp \
--guard.bmp title.bmp mapnames
-+guard.bmp title.bmp
- 
- EXTRA_DIST = $(convdata_DATA)
- 
-diff --git a/lgc-pg/convdata/Makefile.in b/lgc-pg/convdata/Makefile.in
-index 838eb12..be6fcda 100644
---- a/lgc-pg/convdata/Makefile.in
-+++ b/lgc-pg/convdata/Makefile.in
-@@ -315,7 +315,7 @@ convdata_DATA = \
- crosshair.bmp damage_bars.bmp fog.bmp grid.bmp select_frame.bmp \
- strength.bmp air2.wav air.wav leg.wav sea.wav wheeled.wav tracked.wav \
- battle.wav attack.bmp move.bmp select.wav reinf danger.bmp \
--guard.bmp title.bmp mapnames
-+guard.bmp title.bmp
- 
- EXTRA_DIST = $(convdata_DATA)
- all: all-am
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2c54465..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-icon.patch
-desktop-file.patch
-remove-mapnames.patch

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