From 29147b33e032c50257de06386c8801f18f0542de Mon Sep 17 00:00:00 2001 From: Andrew Flegg Date: Thu, 10 Jun 2010 16:03:11 +0100 Subject: [PATCH] Make build system update version number, so it doesn't need to be maintained separately. --- package/Makefile | 7 +++++-- package/debian/changelog | 1 + package/src/org/maemo/hermes/gui/gtkui.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/Makefile b/package/Makefile index a66a590..cd218f0 100644 --- a/package/Makefile +++ b/package/Makefile @@ -2,10 +2,13 @@ # Makefile for Hermes: Contacts Updated # (c) Andrew Flegg 2009. Released under the Artistic Licence. +DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') + compile: + perl -pi -e "s/(WimpWorks\.__init__.*?version\s*=\s*)['\"].*?['\"]/\1'${DEBVERS}'/" src/org/maemo/hermes/gui/gtkui.py perl -ni -e 'print; exit if /^XB-Maemo-Icon-26:$$/' debian/control uuencode -m share/hermes-48.png - | perl -ne 'print " $$_" unless $$. == 1 or /^====$$/' >>debian/control - py_compilefiles src/*.py + py_compilefiles `find src -type f -name '*.py'` cd po && $(MAKE) compile mkdir bin @@ -24,7 +27,7 @@ install: cd po && $(MAKE) install clean: - rm -f src/*.py[oc] + rm -f `find src -type f -name '*.pyo' -o -name '*.pyc'` rm -f build-stamp configure-stamp rm -rf debian/hermes bin find . -name *~ -exec rm -f {} \; diff --git a/package/debian/changelog b/package/debian/changelog index 91736b4..fe02e64 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,6 +1,7 @@ hermes (0.8.2) unstable; urgency=low * Tweak dbus command to launch browser in attempt to fix MB#8369. + * Add about dialogue box. * ... -- Andrew Flegg Thu, 10 Jun 2010 14:57:35 +0100 diff --git a/package/src/org/maemo/hermes/gui/gtkui.py b/package/src/org/maemo/hermes/gui/gtkui.py index 26f045e..a639e72 100644 --- a/package/src/org/maemo/hermes/gui/gtkui.py +++ b/package/src/org/maemo/hermes/gui/gtkui.py @@ -26,7 +26,7 @@ class HermesGUI(WimpWorks): # ----------------------------------------------------------------------- def __init__(self, providers = None): gettext.install('hermes','/opt/hermes/share/locale/') - WimpWorks.__init__(self, 'Hermes', version = '0.9.0', dbus_name = 'org.maemo.hermes') + WimpWorks.__init__(self, 'Hermes', version = '0.8.2', dbus_name = 'org.maemo.hermes') self.set_background('background.png') layout = HildonMainScreenLayout(offset = 0.8, container = self) -- 1.7.9.5