[openyahtzee] 07/10: Drop all patches. Applied 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 openyahtzee.

commit 89f086f3da52a4474660390029fff10725dcf8fd
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jan 9 18:30:43 2016 +0100

    Drop all patches. Applied upstream.
---
 debian/patches/keywords.patch | 18 ------------
 debian/patches/series         |  2 --
 debian/patches/wxstrtol.patch | 67 -------------------------------------------
 3 files changed, 87 deletions(-)

diff --git a/debian/patches/keywords.patch b/debian/patches/keywords.patch
deleted file mode 100644
index 58a647a..0000000
--- a/debian/patches/keywords.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Wed, 29 Apr 2015 11:59:44 +0200
-Subject: keywords
-
-Forwarded: https://sourceforge.net/p/openyahtzee/bugs/17/
----
- openyahtzee.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/openyahtzee.desktop b/openyahtzee.desktop
-index 7e3c8be..1313c2b 100644
---- a/openyahtzee.desktop
-+++ b/openyahtzee.desktop
-@@ -8,3 +8,4 @@ TryExec=openyahtzee
- Icon=openyahtzee
- Terminal=false
- Categories=Game;BoardGame;
-+Keywords=dice;board;yahtzee;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b640df7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-wxstrtol.patch
-keywords.patch
diff --git a/debian/patches/wxstrtol.patch b/debian/patches/wxstrtol.patch
deleted file mode 100644
index 485a14c..0000000
--- a/debian/patches/wxstrtol.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Guy Rutenberg <guyrutenberg at gmail.com>
-Date: Sat, 25 Oct 2014 15:33:42 +0200
-Subject: wxstrtol
-
-Fixes a FTBFS with recent versions of wx3.0.
----
- src/MainFrame.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/MainFrame.cpp b/src/MainFrame.cpp
-index 2128376..8e29d6d 100644
---- a/src/MainFrame.cpp
-+++ b/src/MainFrame.cpp
-@@ -510,7 +510,7 @@ void MainFrame::OnUndo(wxCommandEvent& event)
- 		wxString tempstr;
- 	
- 		tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> GetValue();
--		tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) - 100);
-+		tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) - 100);
- 		((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> SetValue(tempstr);
- 	}
- 
-@@ -936,7 +936,7 @@ void MainFrame::YahtzeeBonus()
- 		return;
- 	if (m_score_dice.IsYahtzee()) {
- 		tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> GetValue();
--		tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) + 100);
-+		tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) + 100);
- 		((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> SetValue(tempstr);
- 		m_yahtzeebonus = true;
- 	}	
-@@ -973,7 +973,7 @@ void MainFrame::EndofGame()
- 
- 	for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){
- 		tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
--		upperscore += wxStrtol(tempstr, NULL, 10);
-+		upperscore += strtol(tempstr.mb_str(), NULL, 10);
- 	}
- 	
- 	tempstr.Printf(wxT("%li"),upperscore);
-@@ -992,7 +992,7 @@ void MainFrame::EndofGame()
- 	//calculate total on lower section
- 	for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) {
- 		tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
--		lowerscore += wxStrtol(tempstr, NULL, 10);
-+		lowerscore += strtol(tempstr.mb_str(), NULL, 10);
- 	}
- 	
- 	tempstr.Printf(wxT("%li"),lowerscore);
-@@ -1091,7 +1091,7 @@ void MainFrame::CalculateSubTotal()
- 
- 	for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){
- 		tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
--		upperscore += wxStrtol(tempstr, NULL, 10);
-+		upperscore += strtol(tempstr.mb_str(), NULL, 10);
- 	}
- 	
- 	tempstr.Printf(wxT("%li"),upperscore);
-@@ -1105,7 +1105,7 @@ void MainFrame::CalculateSubTotal()
- 
- 	for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) {
- 		tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue();
--		lowerscore += wxStrtol(tempstr, NULL, 10);
-+		lowerscore += strtol(tempstr.mb_str(), NULL, 10);
- 	}
- 	
- 	tempstr.Printf(wxT("%li"),lowerscore);

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