Indicator Applet

Merge lp://staging/~indicator-applet-developers/indicator-applet/indicate-python-packaging-0.2 into lp://staging/~ubuntu-desktop/indicator-applet/indicate-python-ubuntu

  1. indicate-python-packaging-0.2
  2. Merge into indicate-python-ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~indicator-applet-developers/indicator-applet/indicate-python-packaging-0.2
Merge into: lp://staging/~ubuntu-desktop/indicator-applet/indicate-python-ubuntu
Diff against target: 156 lines (+33/-20)
8 files modified
.bzrignore (+1/-0)
Makefile.am (+1/-1)
configure.ac (+4/-4)
debian/changelog (+8/-0)
debian/control (+2/-2)
indicate/indicate.defs (+4/-0)
tests/im-client.py (+2/-2)
tests/listen-and-print.py (+11/-11)
To merge this branch: bzr merge lp://staging/~indicator-applet-developers/indicator-applet/indicate-python-packaging-0.2
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Review via email: mp+18740@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

0.3.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2009-03-19 15:49:13 +0000
3+++ .bzrignore 2010-02-06 00:45:25 +0000
4@@ -20,3 +20,4 @@
5 .libs
6 indicate-python-0.0.1.tar.gz
7 indicate-python-0.1.1.tar.gz
8+indicate/indicate.c
9
10=== modified file 'Makefile.am'
11--- Makefile.am 2009-04-09 14:59:27 +0000
12+++ Makefile.am 2010-02-06 00:45:25 +0000
13@@ -1,4 +1,4 @@
14-SUBDIRS = src tests
15+SUBDIRS = indicate tests
16
17 EXTRA_DIST = \
18 AUTHORS NEWS INSTALL COPYING.LGPL-3 COPYING.LGPL-2.1 README \
19
20=== modified file 'configure.ac'
21--- configure.ac 2009-09-14 15:56:26 +0000
22+++ configure.ac 2010-02-06 00:45:25 +0000
23@@ -1,16 +1,16 @@
24-AC_INIT(indicate-python, 0.2.0, eitan@ascender.com)
25+AC_INIT(indicate-python, 0.3.0, eitan@ascender.com)
26 AC_PREREQ(2.50)
27 AC_CONFIG_SRCDIR(config.h.in)
28 AC_COPYRIGHT([Copyright 2009 Canonical])
29
30 PACKAGE=indicate-python
31-VERSION=0.2.0
32+VERSION=0.3.0
33
34 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
35 AM_CONFIG_HEADER(config.h)
36
37 PYGTK_REQUIRED=2.14.0
38-LIBINDICATE_REQUIRED=0.2.0
39+LIBINDICATE_REQUIRED=0.3.1
40 PYGOBJECT_REQUIRED=0.22
41
42 AM_MAINTAINER_MODE
43@@ -40,7 +40,7 @@
44
45 AC_CONFIG_FILES([
46 Makefile
47-src/Makefile
48+indicate/Makefile
49 tests/Makefile
50 ])
51
52
53=== modified file 'debian/changelog'
54--- debian/changelog 2009-09-17 17:14:30 +0000
55+++ debian/changelog 2010-02-06 00:45:25 +0000
56@@ -1,3 +1,11 @@
57+indicate-python (0.3.0-0ubuntu1) lucid; urgency=low
58+
59+ * Upstream Release 0.3.0
60+ * Update to libindicate 0.3.0
61+ * debian/control: Increasting libindicate dependency to 0.3.1
62+
63+ -- Ted Gould <ted@ubuntu.com> Fri, 05 Feb 2010 16:42:20 -0800
64+
65 indicate-python (0.2.0-0ubuntu1) karmic; urgency=low
66
67 * Upstream release 0.2.0 (LP: #427991)
68
69=== modified file 'debian/control'
70--- debian/control 2009-09-17 15:36:52 +0000
71+++ debian/control 2010-02-06 00:45:25 +0000
72@@ -9,8 +9,8 @@
73 autotools-dev,
74 python-all-dev,
75 python-gtk2-dev,
76- libindicate-dev (>= 0.2.0),
77- libindicate-gtk-dev
78+ libindicate-dev (>= 0.3.1),
79+ libindicate-gtk-dev (>= 0.3.1)
80 Standards-Version: 3.8.0
81 Homepage: https://launchpad.net/indicator-applet
82 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/indicate-python-ubuntu
83
84=== renamed directory 'src' => 'indicate'
85=== added symlink 'indicate/_indicate.so'
86=== target is u'.libs/_indicate.so'
87=== modified file 'indicate/indicate.defs'
88--- src/indicate.defs 2009-09-14 18:36:15 +0000
89+++ indicate/indicate.defs 2010-02-06 00:45:25 +0000
90@@ -80,6 +80,9 @@
91 (of-object "IndicateIndicator")
92 (c-name "indicate_indicator_user_display")
93 (return-type "none")
94+ (parameters
95+ '("guint" "timestamp")
96+ )
97 )
98
99 (define-method set_property
100@@ -244,6 +247,7 @@
101 (parameters
102 '("IndicateListenerServer*" "server")
103 '("IndicateListenerIndicator*" "indicator")
104+ '("guint" "timestamp")
105 )
106 )
107
108
109=== modified file 'tests/im-client.py'
110--- tests/im-client.py 2009-09-17 14:19:08 +0000
111+++ tests/im-client.py 2010-02-06 00:45:25 +0000
112@@ -48,10 +48,10 @@
113
114 return True
115
116-def display(indicator):
117+def display(indicator, timestamp):
118 print "Ah, my indicator has been displayed"
119
120-def server_display(server):
121+def server_display(server, timestamp):
122 print "Ah, my server has been displayed"
123
124
125
126=== modified file 'tests/listen-and-print.py'
127--- tests/listen-and-print.py 2009-04-10 15:17:38 +0000
128+++ tests/listen-and-print.py 2010-02-06 00:45:25 +0000
129@@ -58,17 +58,17 @@
130 # TODO: Not in libindicate API yet.
131 return
132
133-def indicator_added(listener, server, indicator, typ):
134- print "Indicator Added: %s %s %s" % \
135- (server, indicator, typ)
136-
137-def indicator_removed(listener, server, indicator, typ):
138- print "Indicator Removed: %s %s %s" % \
139- (server, indicator, typ)
140-
141-def indicator_modified(listener, server, indicator, typ, prop):
142- print "Indicator Modified: %s %s %s %s" % \
143- (server, indicator, typ, prop)
144+def indicator_added(listener, server, indicator):
145+ print "Indicator Added: %s %s" % \
146+ (server, indicator)
147+
148+def indicator_removed(listener, server, indicator):
149+ print "Indicator Removed: %s %s" % \
150+ (server, indicator)
151+
152+def indicator_modified(listener, server, indicator, prop):
153+ print "Indicator Modified: %s %s %s" % \
154+ (server, indicator, prop)
155 show_property(listener, server,
156 indicator, prop)
157

Subscribers

People subscribed via source and target branches

to all changes: