1
=== modified file 'debian/changelog'
2
--- debian/changelog	2010-05-21 23:05:51 +0000
3
+++ debian/changelog	2010-07-02 02:05:40 +0000
4
@@ -1,3 +1,10 @@
5
1
hamster-applet (2.30.1-0ubuntu2) maverick; urgency=low
6
2
7
3
  * Change strange "from .hamster import" statements occurring inside the
8
4
    hamster python module, causing ImportErrors.  (LP: #600857)
9
5
10
6
 -- Martin Pool <mbp@sourcefrog.net>  Fri, 02 Jul 2010 11:48:09 +1000
11
7
12
1
hamster-applet (2.30.1-0ubuntu1) maverick; urgency=low
8
hamster-applet (2.30.1-0ubuntu1) maverick; urgency=low
13
2
9
14
3
  * New upstream release. (LP: #580522)
10
  * New upstream release. (LP: #580522)
15
4
11
16
=== modified file 'src/hamster/widgets/activityentry.py'
17
--- src/hamster/widgets/activityentry.py	2010-04-16 03:50:28 +0000
18
+++ src/hamster/widgets/activityentry.py	2010-07-02 02:05:40 +0000
19
@@ -20,10 +20,10 @@
20
20
import gtk, gobject
20
import gtk, gobject
21
21
import datetime as dt
21
import datetime as dt
22
22
22
24
23
from .hamster.configuration import runtime
23
from hamster.configuration import runtime
25
24
24
28
25
from .hamster import stuff
25
from hamster import stuff
29
26
from .hamster.stuff import format_duration
26
from hamster.stuff import format_duration
30
27
27
31
28
class ActivityEntry(gtk.Entry):
28
class ActivityEntry(gtk.Entry):
32
29
    __gsignals__ = {
29
    __gsignals__ = {
33
30
30
34
=== modified file 'src/hamster/widgets/dateinput.py'
35
--- src/hamster/widgets/dateinput.py	2010-02-10 02:52:31 +0000
36
+++ src/hamster/widgets/dateinput.py	2010-07-02 02:05:40 +0000
37
@@ -17,7 +17,7 @@
38
17
# You should have received a copy of the GNU General Public License
17
# You should have received a copy of the GNU General Public License
39
18
# along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
18
# along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
40
19
19
42
20
from .hamster.stuff import format_duration
20
from hamster.stuff import format_duration
43
21
import gtk
21
import gtk
44
22
import datetime as dt
22
import datetime as dt
45
23
import calendar
23
import calendar
46
24
24
47
=== modified file 'src/hamster/widgets/dayline.py'
48
--- src/hamster/widgets/dayline.py	2010-02-10 02:52:31 +0000
49
+++ src/hamster/widgets/dayline.py	2010-07-02 02:05:40 +0000
50
@@ -20,8 +20,8 @@
51
20
import gtk
20
import gtk
52
21
import gobject
21
import gobject
53
22
22
56
23
from .hamster import stuff
23
from hamster import stuff
57
24
from .hamster import graphics
24
from hamster import graphics
58
25
25
59
26
import time
26
import time
60
27
import datetime as dt
27
import datetime as dt
61
28
28
62
=== modified file 'src/hamster/widgets/facttree.py'
63
--- src/hamster/widgets/facttree.py	2010-05-14 14:28:07 +0000
64
+++ src/hamster/widgets/facttree.py	2010-07-02 02:05:40 +0000
65
@@ -20,8 +20,8 @@
66
20
import gtk, gobject
20
import gtk, gobject
67
21
import datetime as dt
21
import datetime as dt
68
22
22
71
23
from .hamster import stuff
23
from hamster import stuff
72
24
from .hamster.stuff import format_duration, format_activity
24
from hamster.stuff import format_duration, format_activity
73
25
from tags import Tag
25
from tags import Tag
74
26
26
75
27
import pango
27
import pango
76
28
28
77
=== modified file 'src/hamster/widgets/tags.py'
78
--- src/hamster/widgets/tags.py	2010-02-10 02:52:31 +0000
79
+++ src/hamster/widgets/tags.py	2010-07-02 02:05:40 +0000
80
@@ -21,9 +21,9 @@
81
21
import pango, cairo
21
import pango, cairo
82
22
from math import pi
22
from math import pi
83
23
23
85
24
from .hamster import graphics
24
from hamster import graphics
86
25
25
88
26
from .hamster.configuration import runtime
26
from hamster.configuration import runtime
89
27
27
90
28
class TagsEntry(gtk.Entry):
28
class TagsEntry(gtk.Entry):
91
29
    __gsignals__ = {
29
    __gsignals__ = {
92
30
30
93
=== modified file 'src/hamster/widgets/timechart.py'
94
--- src/hamster/widgets/timechart.py	2010-02-10 02:52:31 +0000
95
+++ src/hamster/widgets/timechart.py	2010-07-02 02:05:40 +0000
96
@@ -20,7 +20,7 @@
97
20
import os  # for locale
20
import os  # for locale
98
21
import gtk, pango
21
import gtk, pango
99
22
22
101
23
from .hamster import graphics
23
from hamster import graphics
102
24
24
103
25
import time, datetime as dt
25
import time, datetime as dt
104
26
import calendar
26
import calendar
105
27
27
106
=== modified file 'src/hamster/widgets/timeinput.py'
107
--- src/hamster/widgets/timeinput.py	2010-05-14 14:28:07 +0000
108
+++ src/hamster/widgets/timeinput.py	2010-07-02 02:05:40 +0000
109
@@ -17,7 +17,7 @@
110
17
# You should have received a copy of the GNU General Public License
17
# You should have received a copy of the GNU General Public License
111
18
# along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
18
# along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
112
19
19
114
20
from .hamster.stuff import format_duration
20
from hamster.stuff import format_duration
115
21
import gtk
21
import gtk
116
22
import datetime as dt
22
import datetime as dt
117
23
import calendar
23
import calendar
Status:	Merged
Merge reported by:	Chris Halse Rogers
Merged at revision:	not available
Proposed branch:	lp:~mbp/ubuntu/maverick/hamster-applet/600857-imports
Merge into:	lp:ubuntu/maverick/hamster-applet
Diff against target:	117 lines (+19/-12) 8 files modified debian/changelog (+7/-0) src/hamster/widgets/activityentry.py (+3/-3) src/hamster/widgets/dateinput.py (+1/-1) src/hamster/widgets/dayline.py (+2/-2) src/hamster/widgets/facttree.py (+2/-2) src/hamster/widgets/tags.py (+2/-2) src/hamster/widgets/timechart.py (+1/-1) src/hamster/widgets/timeinput.py (+1/-1)
To merge this branch:	bzr merge lp:~mbp/ubuntu/maverick/hamster-applet/600857-imports
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu branches		2010-07-02	Pending
Review via email: mp+29046@code.launchpad.net