Merge lp:~mbp/ubuntu/maverick/hamster-applet/600857-imports into lp:ubuntu/maverick/hamster-applet

[Martin Pool]

Fix "from .hamster import" statements causing massive failure with ImportError, fixes bug 600857 and friends.

[Chris Halse Rogers (raof)]

Thanks for this.

The packaging currently uses a patch system, so I'll fold these changes into a patch and upload that.

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-21 23:05:51 +0000
+++ debian/changelog	2010-07-02 02:05:40 +0000
@@ -1,3 +1,10 @@
+hamster-applet (2.30.1-0ubuntu2) maverick; urgency=low
+
+  * Change strange "from .hamster import" statements occurring inside the
+    hamster python module, causing ImportErrors.  (LP: #600857)
+
+ -- Martin Pool <[e-mail]>  Fri, 02 Jul 2010 11:48:09 +1000
+
 hamster-applet (2.30.1-0ubuntu1) maverick; urgency=low
 
   * New upstream release. (LP: #580522)

=== modified file 'src/hamster/widgets/activityentry.py'
--- src/hamster/widgets/activityentry.py	2010-04-16 03:50:28 +0000
+++ src/hamster/widgets/activityentry.py	2010-07-02 02:05:40 +0000
@@ -20,10 +20,10 @@
 import gtk, gobject
 import datetime as dt
 
-from .hamster.configuration import runtime
+from hamster.configuration import runtime
 
-from .hamster import stuff
-from .hamster.stuff import format_duration
+from hamster import stuff
+from hamster.stuff import format_duration
 
 class ActivityEntry(gtk.Entry):
     __gsignals__ = {

=== modified file 'src/hamster/widgets/dateinput.py'
--- src/hamster/widgets/dateinput.py	2010-02-10 02:52:31 +0000
+++ src/hamster/widgets/dateinput.py	2010-07-02 02:05:40 +0000
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
 
-from .hamster.stuff import format_duration
+from hamster.stuff import format_duration
 import gtk
 import datetime as dt
 import calendar

=== modified file 'src/hamster/widgets/dayline.py'
--- src/hamster/widgets/dayline.py	2010-02-10 02:52:31 +0000
+++ src/hamster/widgets/dayline.py	2010-07-02 02:05:40 +0000
@@ -20,8 +20,8 @@
 import gtk
 import gobject
 
-from .hamster import stuff
-from .hamster import graphics
+from hamster import stuff
+from hamster import graphics
 
 import time
 import datetime as dt

=== modified file 'src/hamster/widgets/facttree.py'
--- src/hamster/widgets/facttree.py	2010-05-14 14:28:07 +0000
+++ src/hamster/widgets/facttree.py	2010-07-02 02:05:40 +0000
@@ -20,8 +20,8 @@
 import gtk, gobject
 import datetime as dt
 
-from .hamster import stuff
-from .hamster.stuff import format_duration, format_activity
+from hamster import stuff
+from hamster.stuff import format_duration, format_activity
 from tags import Tag
 
 import pango

=== modified file 'src/hamster/widgets/tags.py'
--- src/hamster/widgets/tags.py	2010-02-10 02:52:31 +0000
+++ src/hamster/widgets/tags.py	2010-07-02 02:05:40 +0000
@@ -21,9 +21,9 @@
 import pango, cairo
 from math import pi
 
-from .hamster import graphics
+from hamster import graphics
 
-from .hamster.configuration import runtime
+from hamster.configuration import runtime
 
 class TagsEntry(gtk.Entry):
     __gsignals__ = {

=== modified file 'src/hamster/widgets/timechart.py'
--- src/hamster/widgets/timechart.py	2010-02-10 02:52:31 +0000
+++ src/hamster/widgets/timechart.py	2010-07-02 02:05:40 +0000
@@ -20,7 +20,7 @@
 import os  # for locale
 import gtk, pango
 
-from .hamster import graphics
+from hamster import graphics
 
 import time, datetime as dt
 import calendar

=== modified file 'src/hamster/widgets/timeinput.py'
--- src/hamster/widgets/timeinput.py	2010-05-14 14:28:07 +0000
+++ src/hamster/widgets/timeinput.py	2010-07-02 02:05:40 +0000
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
 
-from .hamster.stuff import format_duration
+from hamster.stuff import format_duration
 import gtk
 import datetime as dt
 import calendar