Merge lp:~andrewsomething/gm-notify/lp-597407 into lp:gm-notify

Proposed by Andrew Starr-Bochicchio on 2010-06-22
Status: Merged
Merged at revision: 74
Proposed branch: lp:~andrewsomething/gm-notify/lp-597407
Merge into: lp:gm-notify
Diff against target: 38 lines (+3/-3)
3 files modified
data/gm-notify-config.desktop (+1/-1)
data/gm-notify.desktop (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~andrewsomething/gm-notify/lp-597407
Reviewer Review Type Date Requested Status
Alexander Hungenberg (community) 2010-06-22 Approve on 2010-06-22
Review via email: mp+28235@code.launchpad.net

Description of the change

To post a comment you must log in.
74. By Alexander Hungenberg <defreng@defreng-netbook> on 2010-06-22

Merge Andrews branch to fix Bug #597407

thx

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/gm-notify-config.desktop'
2--- data/gm-notify-config.desktop 2009-04-25 21:12:44 +0000
3+++ data/gm-notify-config.desktop 2010-06-22 19:48:30 +0000
4@@ -5,6 +5,6 @@
5 Icon=evolution
6 Type=Application
7 Categories=GNOME;GTK;Settings;DesktopSettings;
8-Exec=gm-notify-config.py
9+Exec=gm-notify-config
10 StartupNotify=False
11 Terminal=false
12
13=== modified file 'data/gm-notify.desktop'
14--- data/gm-notify.desktop 2010-05-03 19:12:13 +0000
15+++ data/gm-notify.desktop 2010-06-22 19:48:30 +0000
16@@ -4,6 +4,6 @@
17 Comment=An E-Mail Notifier for Google Mail
18 Icon=applications-email-panel
19 Type=Application
20-Exec=gm-notify.py
21+Exec=gm-notify
22 StartupNotify=False
23 Terminal=false
24
25=== renamed file 'gm-notify.py' => 'gm-notify'
26=== renamed file 'gm-notify-config.py' => 'gm-notify-config'
27=== modified file 'setup.py'
28--- setup.py 2010-05-05 19:51:23 +0000
29+++ setup.py 2010-06-22 19:48:30 +0000
30@@ -8,7 +8,7 @@
31 author='Alexander Hungenberg',
32 author_email='alexander.hungenberg@gmail.com',
33 py_modules=['gtalk', 'gm_notify_keyring'],
34- scripts=['gm-notify.py', 'gm-notify-config.py'],
35+ scripts=['gm-notify', 'gm-notify-config'],
36 data_files=[('/usr/share/applications', ['data/gm-notify-config.desktop']),
37 ('/usr/share/indicators/messages/applications', ['data/gm-notify']),
38 ('/usr/share/gm-notify', ['data/gm-notify.desktop']),

Subscribers

People subscribed via source and target branches

to status/vote changes: