From 990e3d2ed1326752744568c9d6c55f4ae708ad3b Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Thu, 18 Nov 2010 17:44:56 -0500
Subject: [PATCH 1/4] remove spurious ( ) from carbon/merge hh detection

---
 pyfpdb/CarbonToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/CarbonToFpdb.py b/pyfpdb/CarbonToFpdb.py
index cf8794da..e11d1591 100644
--- a/pyfpdb/CarbonToFpdb.py
+++ b/pyfpdb/CarbonToFpdb.py
@@ -66,7 +66,7 @@ class Carbon(HandHistoryConverter):
     # Static regexes
     re_SplitHands = re.compile(r'</game>\n+(?=<game)')
     re_TailSplitHands = re.compile(r'(</game>)')
-    re_GameInfo = re.compile(r'<description type="(?P<GAME>[a-zA-Z ]+)" stakes="(?P<LIMIT>[a-zA-Z ]+) \(\$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)\)"/>', re.MULTILINE)
+    re_GameInfo = re.compile(r'<description type="(?P<GAME>[a-zA-Z ]+)" stakes="(?P<LIMIT>[a-zA-Z ]+) \$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)"/>', re.MULTILINE)
     re_HandInfo = re.compile(r'<game id="(?P<HID1>[0-9]+)-(?P<HID2>[0-9]+)" starttime="(?P<DATETIME>[0-9]+)" numholecards="2" gametype="2" realmoney="true" data="[0-9]+\|(?P<TABLE>[^\(]+)', re.MULTILINE)
     re_Button = re.compile(r'<players dealer="(?P<BUTTON>[0-9]+)">')
     re_PlayerInfo = re.compile(r'<player seat="(?P<SEAT>[0-9]+)" nickname="(?P<PNAME>.+)" balance="\$(?P<CASH>[.0-9]+)" dealtin="(?P<DEALTIN>(true|false))" />', re.MULTILINE)

From 742347c5c78ad8c5e08f13e6e43f28899cb8ab03 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Thu, 18 Nov 2010 17:54:19 -0500
Subject: [PATCH 2/4] undo my last change as it breaks merge 4.x

---
 pyfpdb/CarbonToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/CarbonToFpdb.py b/pyfpdb/CarbonToFpdb.py
index e11d1591..1a1541ee 100644
--- a/pyfpdb/CarbonToFpdb.py
+++ b/pyfpdb/CarbonToFpdb.py
@@ -66,7 +66,7 @@ class Carbon(HandHistoryConverter):
     # Static regexes
     re_SplitHands = re.compile(r'</game>\n+(?=<game)')
     re_TailSplitHands = re.compile(r'(</game>)')
-    re_GameInfo = re.compile(r'<description type="(?P<GAME>[a-zA-Z ]+)" stakes="(?P<LIMIT>[a-zA-Z ]+) \$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)"/>', re.MULTILINE)
+    re_GameInfo = re.compile(r'<description type="(?P<GAME>[a-zA-Z ]+)" stakes="(?P<LIMIT>[a-zA-Z ]+) ?\(\$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)?\)"/>', re.MULTILINE)
     re_HandInfo = re.compile(r'<game id="(?P<HID1>[0-9]+)-(?P<HID2>[0-9]+)" starttime="(?P<DATETIME>[0-9]+)" numholecards="2" gametype="2" realmoney="true" data="[0-9]+\|(?P<TABLE>[^\(]+)', re.MULTILINE)
     re_Button = re.compile(r'<players dealer="(?P<BUTTON>[0-9]+)">')
     re_PlayerInfo = re.compile(r'<player seat="(?P<SEAT>[0-9]+)" nickname="(?P<PNAME>.+)" balance="\$(?P<CASH>[.0-9]+)" dealtin="(?P<DEALTIN>(true|false))" />', re.MULTILINE)

From e53e386346a2636b516124d808cdd1001f366e8a Mon Sep 17 00:00:00 2001
From: Steffen Schaumburg <steffen@schaumburger.info>
Date: Sat, 20 Nov 2010 09:05:52 +0100
Subject: [PATCH 3/4] add TODO to gettextify stove

---
 pyfpdb/Stove.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyfpdb/Stove.py b/pyfpdb/Stove.py
index ffbdff4f..eb939c0f 100755
--- a/pyfpdb/Stove.py
+++ b/pyfpdb/Stove.py
@@ -9,6 +9,7 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, version 3 of the License.
 #
+#TODO: gettextify
 
 import sys, random
 import pokereval

From da800b7abb5e205f340d833a1b9982d9b4b23afc Mon Sep 17 00:00:00 2001
From: Steffen Schaumburg <steffen@schaumburger.info>
Date: Mon, 22 Nov 2010 04:25:31 +0100
Subject: [PATCH 4/4] restore HUD executable flag

---
 pyfpdb/HUD_main.pyw | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 pyfpdb/HUD_main.pyw

diff --git a/pyfpdb/HUD_main.pyw b/pyfpdb/HUD_main.pyw
old mode 100644
new mode 100755