From b8f19741e0b7fb6258c6d788e45ba400590be494 Mon Sep 17 00:00:00 2001 From: Mika Bostrom Date: Wed, 21 Oct 2009 20:24:46 +0300 Subject: [PATCH] Fix packaging issues Affected files: * Configuration.py * Database.py * HandHistoryConverter.py * fpdb_import.py and setup.py to a lesser extent. Logging requires a configuration file when initialising the class. If we are executing from outside the source tree, this file is not present. Catch config parser's error and try to provide the logging config file from debian package path. Update symlink target to match python-support from latest Debian and the oncoming Ubuntu versions. --- packaging/debian/changelog | 6 ++++++ packaging/debian/links | 2 +- pyfpdb/Configuration.py | 8 +++++++- pyfpdb/Database.py | 8 +++++++- pyfpdb/HandHistoryConverter.py | 8 +++++++- pyfpdb/fpdb_import.py | 8 +++++++- setup.py | 11 +++++++++-- 7 files changed, 44 insertions(+), 7 deletions(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 84ecbce5..ce102bf5 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +free-poker-tools (0.11.3+git20091023) unstable; urgency=low + + * Snapshot release + + -- Mika Bostrom Wed, 21 Oct 2009 16:47:12 +0300 + free-poker-tools (0.10.99) unstable; urgency=low * Initial packaging release. diff --git a/packaging/debian/links b/packaging/debian/links index 01d1c490..5a4601a7 100644 --- a/packaging/debian/links +++ b/packaging/debian/links @@ -1 +1 @@ -/usr/share/python-support/python-fpdb/fpdb/fpdb.py /usr/bin/fpdb +/usr/share/pyshared/fpdb/fpdb.py /usr/bin/fpdb diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index 924d6584..5dba6aac 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -35,7 +35,13 @@ import xml.dom.minidom from xml.dom.minidom import Node import logging, logging.config -logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +import ConfigParser + +try: # local path + logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +except ConfigParser.NoSectionError: # debian package path + logging.config.fileConfig('/usr/share/python-fpdb/logging.conf') + log = logging.getLogger("config") log.debug("config logger initialised") diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 4a0f2e17..87b1cd52 100755 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -46,7 +46,13 @@ import Tourney from Exceptions import * import logging, logging.config -logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +import ConfigParser + +try: # local path + logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +except ConfigParser.NoSectionError: # debian package path + logging.config.fileConfig('/usr/share/python-fpdb/logging.conf') + log = logging.getLogger('db') diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index e40694ea..0642d845 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -37,7 +37,13 @@ import gettext gettext.install('fpdb') import logging, logging.config -logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +import ConfigParser + +try: + logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +except ConfigParser.NoSectionError: # debian package path + logging.config.fileConfig('/usr/share/python-fpdb/logging.conf') + log = logging.getLogger("parser") import pygtk diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py index 878b64b2..4d384372 100644 --- a/pyfpdb/fpdb_import.py +++ b/pyfpdb/fpdb_import.py @@ -43,7 +43,13 @@ import Configuration import Exceptions import logging, logging.config -logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +import ConfigParser + +try: + logging.config.fileConfig(os.path.join(sys.path[0],"logging.conf")) +except ConfigParser.NoSectionError: # debian package path + logging.config.fileConfig('/usr/share/python-fpdb/logging.conf') + log = logging.getLogger('importer') # database interface modules diff --git a/setup.py b/setup.py index 668693cf..737ad18e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from distutils.core import setup setup(name = 'fpdb', description = 'Free Poker Database', - version = '0.10.999', + version = '0.11.3', author = 'FPDB team', author_email = 'fpdb-main@lists.sourceforge.net', packages = ['fpdb'], @@ -13,5 +13,12 @@ setup(name = 'fpdb', data_files = [ ('/usr/share/doc/python-fpdb', ['docs/readme.txt', 'docs/release-notes.txt', - 'docs/tabledesign.html', 'THANKS.txt'])] + 'docs/tabledesign.html', 'THANKS.txt']), + ('/usr/share/pixmaps', + ['gfx/fpdb-icon.png']), + ('/usr/share/applications', + ['files/fpdb.desktop']), + ('/usr/share/python-fpdb', + ['pyfpdb/logging.conf']) + ] )