From a5a507ece798847b67dbc6f6515e1311a3f53961 Mon Sep 17 00:00:00 2001 From: Mika Bostrom Date: Wed, 16 Jun 2010 08:16:06 +0300 Subject: [PATCH 1/2] Update debian packaging Changelog bump for new snapshot, and executable script renames that were done for win32 setups. --- packaging/debian/changelog | 9 +++++++++ packaging/debian/links | 2 +- packaging/debian/python-fpdb.postinst | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index ebd45a53..e482e349 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,12 @@ +free-poker-tools (0.20~git20100616) unstable; urgency=low + + * Snapshot release + * Executable names have been changed to accommodate for some win32 + trouble cases; update paths + * Improved statistics + + -- Mika Bostrom Wed, 16 Jun 2010 08:10:00 +0300 + free-poker-tools (0.20~git20100305) unstable; urgency=low * New snapshot diff --git a/packaging/debian/links b/packaging/debian/links index 5a4601a7..148aad4f 100644 --- a/packaging/debian/links +++ b/packaging/debian/links @@ -1 +1 @@ -/usr/share/pyshared/fpdb/fpdb.py /usr/bin/fpdb +/usr/share/pyshared/fpdb/fpdb.pyw /usr/bin/fpdb diff --git a/packaging/debian/python-fpdb.postinst b/packaging/debian/python-fpdb.postinst index 9680be90..99d25018 100644 --- a/packaging/debian/python-fpdb.postinst +++ b/packaging/debian/python-fpdb.postinst @@ -3,4 +3,4 @@ # When installed into .../fpdb/ the script gets mode 644 # Note: "dh_fixperms -Xfpdb.py" did not work, hence this hack chmod 755 /usr/bin/fpdb -chmod 755 /usr/share/pyshared/fpdb/HUD_main.py +chmod 755 /usr/share/pyshared/fpdb/HUD_main.pyw From 22fb0338233cacef39d4bc209bb4de00622ee4dd Mon Sep 17 00:00:00 2001 From: Mika Bostrom Date: Fri, 2 Jul 2010 12:32:05 +0300 Subject: [PATCH 2/2] Update debian packaging for new snapshot * Deal with .pyw file extensions, because distutils doesn't * Remove unnecessary win32-only build files from fpdb/* * Tweak .desktop file for better menu integration * Assume that build happens with python2.6 --- files/fpdb.desktop | 2 +- packaging/debian/changelog | 4 ++-- packaging/debian/rules | 7 +++++++ setup.py | 3 +-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/files/fpdb.desktop b/files/fpdb.desktop index eed85047..71380ac3 100644 --- a/files/fpdb.desktop +++ b/files/fpdb.desktop @@ -5,5 +5,5 @@ Exec=/usr/bin/fpdb Icon=fpdb-icon.png Terminal=true Type=Application -Categories=Utility +Categories=Utility;GTK;Application diff --git a/packaging/debian/changelog b/packaging/debian/changelog index e482e349..e95fd1c5 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,8 +1,8 @@ -free-poker-tools (0.20~git20100616) unstable; urgency=low +free-poker-tools (0.20~git20100630) unstable; urgency=low * Snapshot release * Executable names have been changed to accommodate for some win32 - trouble cases; update paths + trouble cases; install these files manually to build-tree * Improved statistics -- Mika Bostrom Wed, 16 Jun 2010 08:10:00 +0300 diff --git a/packaging/debian/rules b/packaging/debian/rules index 2ae2c776..9106c7bc 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -23,6 +23,13 @@ install: build dh_installdirs # python setup.py install --root=debian/$(PACKAGE) --prefix=/usr --no-compile + # Copy *.pyw manually in packaging tree + cp pyfpdb/*.pyw debian/$(PACKAGE)/usr/lib/python2.6/site-packages/fpdb/ + # Remove scripts that are only useful in win32 + rm debian/$(PACKAGE)/usr/lib/python2.6/site-packages/fpdb//windows_make_bats.py + rm debian/$(PACKAGE)/usr/lib/python2.6/site-packages/fpdb/makeexe.py + rm debian/$(PACKAGE)/usr/lib/python2.6/site-packages/fpdb/py2exe_setup.py + binary-indep: build install dh_testdir diff --git a/setup.py b/setup.py index a9f317c9..7440b177 100644 --- a/setup.py +++ b/setup.py @@ -12,8 +12,7 @@ setup(name = 'fpdb', package_dir = { 'fpdb' : 'pyfpdb' }, data_files = [ ('/usr/share/doc/python-fpdb', - ['docs/readme.txt', 'docs/release-notes.txt', - 'docs/tabledesign.html', 'THANKS.txt']), + ['THANKS.txt']), ('/usr/share/pixmaps', ['gfx/fpdb-icon.png', 'gfx/fpdb-icon2.png', 'gfx/fpdb-cards.png'