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
=== modified file '.bzrignore'
--- .bzrignore 2009-03-19 15:49:13 +0000
+++ .bzrignore 2010-02-06 00:45:25 +0000
@@ -20,3 +20,4 @@
20.libs20.libs
21indicate-python-0.0.1.tar.gz21indicate-python-0.0.1.tar.gz
22indicate-python-0.1.1.tar.gz22indicate-python-0.1.1.tar.gz
23indicate/indicate.c
2324
=== modified file 'Makefile.am'
--- Makefile.am 2009-04-09 14:59:27 +0000
+++ Makefile.am 2010-02-06 00:45:25 +0000
@@ -1,4 +1,4 @@
1SUBDIRS = src tests1SUBDIRS = indicate tests
22
3EXTRA_DIST = \3EXTRA_DIST = \
4 AUTHORS NEWS INSTALL COPYING.LGPL-3 COPYING.LGPL-2.1 README \4 AUTHORS NEWS INSTALL COPYING.LGPL-3 COPYING.LGPL-2.1 README \
55
=== modified file 'configure.ac'
--- configure.ac 2009-09-14 15:56:26 +0000
+++ configure.ac 2010-02-06 00:45:25 +0000
@@ -1,16 +1,16 @@
1AC_INIT(indicate-python, 0.2.0, eitan@ascender.com)1AC_INIT(indicate-python, 0.3.0, eitan@ascender.com)
2AC_PREREQ(2.50)2AC_PREREQ(2.50)
3AC_CONFIG_SRCDIR(config.h.in)3AC_CONFIG_SRCDIR(config.h.in)
4AC_COPYRIGHT([Copyright 2009 Canonical])4AC_COPYRIGHT([Copyright 2009 Canonical])
55
6PACKAGE=indicate-python6PACKAGE=indicate-python
7VERSION=0.2.07VERSION=0.3.0
88
9AM_INIT_AUTOMAKE($PACKAGE, $VERSION)9AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
10AM_CONFIG_HEADER(config.h)10AM_CONFIG_HEADER(config.h)
1111
12PYGTK_REQUIRED=2.14.012PYGTK_REQUIRED=2.14.0
13LIBINDICATE_REQUIRED=0.2.013LIBINDICATE_REQUIRED=0.3.1
14PYGOBJECT_REQUIRED=0.2214PYGOBJECT_REQUIRED=0.22
1515
16AM_MAINTAINER_MODE16AM_MAINTAINER_MODE
@@ -40,7 +40,7 @@
4040
41AC_CONFIG_FILES([41AC_CONFIG_FILES([
42Makefile42Makefile
43src/Makefile43indicate/Makefile
44tests/Makefile44tests/Makefile
45])45])
4646
4747
=== modified file 'debian/changelog'
--- debian/changelog 2009-09-17 17:14:30 +0000
+++ debian/changelog 2010-02-06 00:45:25 +0000
@@ -1,3 +1,11 @@
1indicate-python (0.3.0-0ubuntu1) lucid; urgency=low
2
3 * Upstream Release 0.3.0
4 * Update to libindicate 0.3.0
5 * debian/control: Increasting libindicate dependency to 0.3.1
6
7 -- Ted Gould <ted@ubuntu.com> Fri, 05 Feb 2010 16:42:20 -0800
8
1indicate-python (0.2.0-0ubuntu1) karmic; urgency=low9indicate-python (0.2.0-0ubuntu1) karmic; urgency=low
210
3 * Upstream release 0.2.0 (LP: #427991)11 * Upstream release 0.2.0 (LP: #427991)
412
=== modified file 'debian/control'
--- debian/control 2009-09-17 15:36:52 +0000
+++ debian/control 2010-02-06 00:45:25 +0000
@@ -9,8 +9,8 @@
9 autotools-dev,9 autotools-dev,
10 python-all-dev,10 python-all-dev,
11 python-gtk2-dev,11 python-gtk2-dev,
12 libindicate-dev (>= 0.2.0),12 libindicate-dev (>= 0.3.1),
13 libindicate-gtk-dev13 libindicate-gtk-dev (>= 0.3.1)
14Standards-Version: 3.8.014Standards-Version: 3.8.0
15Homepage: https://launchpad.net/indicator-applet15Homepage: https://launchpad.net/indicator-applet
16Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/indicate-python-ubuntu16Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/indicate-python-ubuntu
1717
=== renamed directory 'src' => 'indicate'
=== added symlink 'indicate/_indicate.so'
=== target is u'.libs/_indicate.so'
=== modified file 'indicate/indicate.defs'
--- src/indicate.defs 2009-09-14 18:36:15 +0000
+++ indicate/indicate.defs 2010-02-06 00:45:25 +0000
@@ -80,6 +80,9 @@
80 (of-object "IndicateIndicator")80 (of-object "IndicateIndicator")
81 (c-name "indicate_indicator_user_display")81 (c-name "indicate_indicator_user_display")
82 (return-type "none")82 (return-type "none")
83 (parameters
84 '("guint" "timestamp")
85 )
83)86)
8487
85(define-method set_property88(define-method set_property
@@ -244,6 +247,7 @@
244 (parameters247 (parameters
245 '("IndicateListenerServer*" "server")248 '("IndicateListenerServer*" "server")
246 '("IndicateListenerIndicator*" "indicator")249 '("IndicateListenerIndicator*" "indicator")
250 '("guint" "timestamp")
247 )251 )
248)252)
249253
250254
=== modified file 'tests/im-client.py'
--- tests/im-client.py 2009-09-17 14:19:08 +0000
+++ tests/im-client.py 2010-02-06 00:45:25 +0000
@@ -48,10 +48,10 @@
4848
49 return True49 return True
5050
51def display(indicator):51def display(indicator, timestamp):
52 print "Ah, my indicator has been displayed"52 print "Ah, my indicator has been displayed"
5353
54def server_display(server):54def server_display(server, timestamp):
55 print "Ah, my server has been displayed"55 print "Ah, my server has been displayed"
5656
5757
5858
=== modified file 'tests/listen-and-print.py'
--- tests/listen-and-print.py 2009-04-10 15:17:38 +0000
+++ tests/listen-and-print.py 2010-02-06 00:45:25 +0000
@@ -58,17 +58,17 @@
58 # TODO: Not in libindicate API yet.58 # TODO: Not in libindicate API yet.
59 return59 return
6060
61def indicator_added(listener, server, indicator, typ):61def indicator_added(listener, server, indicator):
62 print "Indicator Added: %s %s %s" % \62 print "Indicator Added: %s %s" % \
63 (server, indicator, typ)63 (server, indicator)
6464
65def indicator_removed(listener, server, indicator, typ):65def indicator_removed(listener, server, indicator):
66 print "Indicator Removed: %s %s %s" % \66 print "Indicator Removed: %s %s" % \
67 (server, indicator, typ)67 (server, indicator)
6868
69def indicator_modified(listener, server, indicator, typ, prop):69def indicator_modified(listener, server, indicator, prop):
70 print "Indicator Modified: %s %s %s %s" % \70 print "Indicator Modified: %s %s %s" % \
71 (server, indicator, typ, prop)71 (server, indicator, prop)
72 show_property(listener, server, 72 show_property(listener, server,
73 indicator, prop)73 indicator, prop)
7474

Subscribers

People subscribed via source and target branches

to all changes: