Cleanup: removal of mer, making things cleaner, etc

git-svn-id: file:///svnroot/quicknote/trunk@119 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2

diff --git a/Makefile b/Makefile
index c54f2b8..3642f91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -75,18 +75,12 @@ package: $(OBJ) build_mo
        cp support/py2deb.py $(BUILD_PATH)/generic
        cp support/fake_py2deb.py $(BUILD_PATH)/generic
 
        cp support/py2deb.py $(BUILD_PATH)/generic
        cp support/fake_py2deb.py $(BUILD_PATH)/generic
 

-       mkdir -p $(BUILD_PATH)/chinook
-       cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/chinook
-       cd $(BUILD_PATH)/chinook ; python builddeb.py chinook

        mkdir -p $(BUILD_PATH)/diablo
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/diablo
        cd $(BUILD_PATH)/diablo ; python builddeb.py diablo
        mkdir -p $(BUILD_PATH)/fremantle
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/fremantle
        cd $(BUILD_PATH)/fremantle ; python builddeb.py fremantle
        mkdir -p $(BUILD_PATH)/diablo
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/diablo
        cd $(BUILD_PATH)/diablo ; python builddeb.py diablo
        mkdir -p $(BUILD_PATH)/fremantle
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/fremantle
        cd $(BUILD_PATH)/fremantle ; python builddeb.py fremantle

-       mkdir -p $(BUILD_PATH)/mer
-       cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/mer
-       cd $(BUILD_PATH)/mer ; python builddeb.py mer

        mkdir -p $(BUILD_PATH)/debian
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
        cd $(BUILD_PATH)/debian ; python builddeb.py debian
        mkdir -p $(BUILD_PATH)/debian
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
        cd $(BUILD_PATH)/debian ; python builddeb.py debian

@@ -94,7 +88,6 @@ package: $(OBJ) build_mo
 upload:
        dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
        dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes
 upload:
        dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
        dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes

-       dput chinook-extras-builder $(BUILD_PATH)/chinook/$(PROJECT_NAME)*.changes

        cp $(BUILD_PATH)/debian/*.deb ../www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)
        cp $(BUILD_PATH)/debian/*.deb ../www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)

diff --git a/src/gtk_toolbox.py b/src/gtk_toolbox.py
index b81d444..784c871 100644 (file)
--- a/src/gtk_toolbox.py
+++ b/src/gtk_toolbox.py
@@ -17,7 +17,7 @@ import gobject
 import gtk
 
 
 import gtk
 
 

-_moduleLogger = logging.getLogger("gtk_toolbox")
+_moduleLogger = logging.getLogger(__name__)

 
 
 def get_screen_orientation():
 
 
 def get_screen_orientation():

diff --git a/src/history.py b/src/history.py
index 1f21fba..c7a7af4 100644 (file)
--- a/src/history.py
+++ b/src/history.py
@@ -21,7 +21,7 @@ except NameError:
        _ = lambda x: x
 
 
        _ = lambda x: x
 
 

-_moduleLogger = logging.getLogger("history")
+_moduleLogger = logging.getLogger(__name__)

 
 
 class HistorySelectionDialog(gtk.Dialog):
 
 
 class HistorySelectionDialog(gtk.Dialog):

diff --git a/src/kopfzeile.py b/src/kopfzeile.py
index 7a7152f..9e0626e 100644 (file)
--- a/src/kopfzeile.py
+++ b/src/kopfzeile.py
@@ -24,7 +24,7 @@ except NameError:
        _ = lambda x: x
 
 
        _ = lambda x: x
 
 

-_moduleLogger = logging.getLogger("kopfzeile")
+_moduleLogger = logging.getLogger(__name__)

 
 
 class Kopfzeile(gtk.HBox):
 
 
 class Kopfzeile(gtk.HBox):

diff --git a/src/notizen.py b/src/notizen.py
index 7225483..978ee28 100644 (file)
--- a/src/notizen.py
+++ b/src/notizen.py
@@ -34,7 +34,7 @@ except NameError:
        _ = lambda x: x
 
 
        _ = lambda x: x
 
 

-_moduleLogger = logging.getLogger("notizen")
+_moduleLogger = logging.getLogger(__name__)

 
 
 class Notizen(gtk.HBox):
 
 
 class Notizen(gtk.HBox):

diff --git a/src/quicknote.py b/src/quicknote.py
index e57ce0d..1dcc853 100755 (executable)
--- a/src/quicknote.py
+++ b/src/quicknote.py
@@ -13,7 +13,7 @@ import sys
 import logging
 import gettext
 
 import logging
 import gettext
 

-_moduleLogger = logging.getLogger("quicknote")
+_moduleLogger = logging.getLogger(__name__)

 gettext.install('quicknote', unicode = 1)
 sys.path.append('/usr/lib/quicknote')
 
 gettext.install('quicknote', unicode = 1)
 sys.path.append('/usr/lib/quicknote')
 

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index 02cc124..92482fa 100644 (file)
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -50,7 +50,7 @@ except NameError:
        _ = lambda x: x
 
 
        _ = lambda x: x
 
 

-_moduleLogger = logging.getLogger("quicknote_gtk")
+_moduleLogger = logging.getLogger(__name__)

 PROFILE_STARTUP = False
 
 
 PROFILE_STARTUP = False
 
 

@@ -63,8 +63,6 @@ class QuicknoteProgram(hildonize.get_app_class()):
                super(QuicknoteProgram, self).__init__()
                self._clipboard = gtk.clipboard_get()
 
                super(QuicknoteProgram, self).__init__()
                self._clipboard = gtk.clipboard_get()
 

-               dblog = os.path.join(self._user_data, "quicknote.log")
-

                _moduleLogger.info('Starting quicknote')
                self._wordWrapEnabled = False
 
                _moduleLogger.info('Starting quicknote')
                self._wordWrapEnabled = False
 

@@ -459,7 +457,7 @@ class QuicknoteProgram(hildonize.get_app_class()):
                dialog.set_name(constants.__pretty_app_name__)
                dialog.set_version(constants.__version__)
                dialog.set_copyright("")
                dialog.set_name(constants.__pretty_app_name__)
                dialog.set_version(constants.__version__)
                dialog.set_copyright("")

-               dialog.set_website("http://axique.de/index.php?f=Quicknote")
+               dialog.set_website("http://quicknote.garage.maemo.org")

                comments = _("%s is a note taking program; it is optimised for quick save and search of notes") % constants.__pretty_app_name__
                dialog.set_comments(comments)
                dialog.set_authors(["Christoph Wurstle <n800@axique.net>", "Ed Page <eopage@byu.net> (Blame him for the most recent bugs)"])
                comments = _("%s is a note taking program; it is optimised for quick save and search of notes") % constants.__pretty_app_name__
                dialog.set_comments(comments)
                dialog.set_authors(["Christoph Wurstle <n800@axique.net>", "Ed Page <eopage@byu.net> (Blame him for the most recent bugs)"])

diff --git a/src/search.py b/src/search.py
index 5843480..fab6710 100644 (file)
--- a/src/search.py
+++ b/src/search.py
@@ -13,7 +13,7 @@ except NameError:
        _ = lambda x: x
 
 
        _ = lambda x: x
 
 

-_moduleLogger = logging.getLogger("search")
+_moduleLogger = logging.getLogger(__name__)

 
 
 class Search(gtk.HBox):
 
 
 class Search(gtk.HBox):

diff --git a/src/simple_list.py b/src/simple_list.py
index 948b04a..34849da 100644 (file)
--- a/src/simple_list.py
+++ b/src/simple_list.py
@@ -24,7 +24,7 @@ except NameError:
        _ = lambda x: x\r
 \r
 \r
        _ = lambda x: x\r
 \r
 \r

-_moduleLogger = logging.getLogger("simple_list")\r
+_moduleLogger = logging.getLogger(__name__)\r

 \r
 \r
 class SimpleList(object):\r
 \r
 \r
 class SimpleList(object):\r

diff --git a/src/speichern.py b/src/speichern.py
index d7fcc12..3277028 100644 (file)
--- a/src/speichern.py
+++ b/src/speichern.py
@@ -24,7 +24,7 @@ except NameError:
        _ = lambda x: x
 
 
        _ = lambda x: x
 
 

-_moduleLogger = logging.getLogger("speichern")
+_moduleLogger = logging.getLogger(__name__)

 
 
 class Speichern(object):
 
 
 class Speichern(object):

diff --git a/src/sqldialog.py b/src/sqldialog.py
index a6cc2d6..81906f6 100755 (executable)
--- a/src/sqldialog.py
+++ b/src/sqldialog.py
@@ -22,7 +22,7 @@ except NameError:
        _ = lambda x: x
 
 
        _ = lambda x: x
 
 

-_moduleLogger = logging.getLogger("sqldialog")
+_moduleLogger = logging.getLogger(__name__)

 
 
 class SqlDialog(gtk.Dialog):
 
 
 class SqlDialog(gtk.Dialog):

diff --git a/src/sync.py b/src/sync.py
index f8acdac..7f9e9f4 100755 (executable)
--- a/src/sync.py
+++ b/src/sync.py
@@ -38,7 +38,7 @@ except NameError:
        _ = lambda x: x
 
 
        _ = lambda x: x
 
 

-_moduleLogger = logging.getLogger("sync")
+_moduleLogger = logging.getLogger(__name__)

 
 
 class ProgressDialog(gtk.Dialog):
 
 
 class ProgressDialog(gtk.Dialog):

diff --git a/support/builddeb.py b/support/builddeb.py
index 8c2531f..4e83f67 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -130,30 +130,24 @@ def build_package(distribution):
        maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
        p.depends += {
                "debian": ", python-glade2",
        maemoSpecificDepends = ", python-osso | python2.5-osso, python-hildon | python2.5-hildon"
        p.depends += {
                "debian": ", python-glade2",

-               "chinook": maemoSpecificDepends,

                "diablo": maemoSpecificDepends,
                "fremantle": maemoSpecificDepends + ", python-glade2",
                "diablo": maemoSpecificDepends,
                "fremantle": maemoSpecificDepends + ", python-glade2",

-               "mer": maemoSpecificDepends + ", python-glade2",

        }[distribution]
        p.section = {
                "debian": "editors",
        }[distribution]
        p.section = {
                "debian": "editors",

-               "chinook": "accessories",

                "diablo": "user/office",
                "fremantle": "user/office",
                "diablo": "user/office",
                "fremantle": "user/office",

-               "mer": "user/office",

        }[distribution]
        p.arch = "all"
        p.urgency = "low"
        }[distribution]
        p.arch = "all"
        p.urgency = "low"

-       p.distribution = "chinook diablo fremantle mer debian"
+       p.distribution = "diablo fremantle debian"

        p.repository = "extras"
        p.changelog = __changelog__
        p.postinstall = __postinstall__
        p.icon = {
                "debian": "26x26-quicknote.png",
        p.repository = "extras"
        p.changelog = __changelog__
        p.postinstall = __postinstall__
        p.icon = {
                "debian": "26x26-quicknote.png",

-               "chinook": "26x26-quicknote.png",

                "diablo": "26x26-quicknote.png",
                "fremantle": "48x48-quicknote.png", # Fremantle natively uses 48x48
                "diablo": "26x26-quicknote.png",
                "fremantle": "48x48-quicknote.png", # Fremantle natively uses 48x48

-               "mer": "48x48-quicknote.png",

        }[distribution]
        p["/usr/bin"] = [ "quicknote.py" ]
        for relPath, files in unflatten_files(find_files(".", "locale")).iteritems():
        }[distribution]
        p["/usr/bin"] = [ "quicknote.py" ]
        for relPath, files in unflatten_files(find_files(".", "locale")).iteritems():