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

[Ted Gould]

[Ted Gould (ted)]

0.3.0

=== modified file '.bzrignore'
--- .bzrignore	2009-03-19 15:49:13 +0000
+++ .bzrignore	2010-02-06 00:45:25 +0000
@@ -20,3 +20,4 @@
 .libs
 indicate-python-0.0.1.tar.gz
 indicate-python-0.1.1.tar.gz
+indicate/indicate.c
 
=== 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 @@
-SUBDIRS = src tests
+SUBDIRS = indicate tests
 
 EXTRA_DIST = \
 	AUTHORS NEWS INSTALL COPYING.LGPL-3 COPYING.LGPL-2.1 README \
 
=== 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 @@
-AC_INIT(indicate-python, 0.2.0, [e-mail])
+AC_INIT(indicate-python, 0.3.0, [e-mail])
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
 AC_COPYRIGHT([Copyright 2009 Canonical])
 
 PACKAGE=indicate-python
-VERSION=0.2.0
+VERSION=0.3.0
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 AM_CONFIG_HEADER(config.h)
 
 PYGTK_REQUIRED=2.14.0
-LIBINDICATE_REQUIRED=0.2.0
+LIBINDICATE_REQUIRED=0.3.1
 PYGOBJECT_REQUIRED=0.22
 
 AM_MAINTAINER_MODE
@@ -40,7 +40,7 @@
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
+indicate/Makefile
 tests/Makefile
 ])
 
 
=== 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 @@
+indicate-python (0.3.0-0ubuntu1) lucid; urgency=low
+
+  * Upstream Release 0.3.0
+    * Update to libindicate 0.3.0
+  * debian/control: Increasting libindicate dependency to 0.3.1
+
+ -- Ted Gould <[e-mail]>  Fri, 05 Feb 2010 16:42:20 -0800
+
 indicate-python (0.2.0-0ubuntu1) karmic; urgency=low
 
   * Upstream release 0.2.0 (LP: #427991)
 
=== 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 @@
                autotools-dev,
                python-all-dev,
                python-gtk2-dev,
-               libindicate-dev (>= 0.2.0),
-               libindicate-gtk-dev
+               libindicate-dev (>= 0.3.1),
+               libindicate-gtk-dev (>= 0.3.1)
 Standards-Version: 3.8.0
 Homepage: https://launchpad.net/indicator-applet
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/indicate-python-ubuntu
 
=== 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 @@
   (of-object "IndicateIndicator")
   (c-name "indicate_indicator_user_display")
   (return-type "none")
+  (parameters
+    '("guint" "timestamp")
+  )
 )
 
 (define-method set_property
@@ -244,6 +247,7 @@
   (parameters
     '("IndicateListenerServer*" "server")
     '("IndicateListenerIndicator*" "indicator")
+    '("guint" "timestamp")
   )
 )
 
 
=== 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 @@
 
     return True
 
-def display(indicator):
+def display(indicator, timestamp):
     print "Ah, my indicator has been displayed"
 
-def server_display(server):
+def server_display(server, timestamp):
     print "Ah, my server has been displayed"
 
 
 
=== 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 @@
     # TODO: Not in libindicate API yet.
     return
 
-def indicator_added(listener, server, indicator, typ):
-    print "Indicator Added:          %s %s %s" % \
-        (server, indicator, typ)
-
-def indicator_removed(listener, server, indicator, typ):
-    print "Indicator Removed:        %s %s %s" % \
-        (server, indicator, typ)
-
-def indicator_modified(listener, server, indicator, typ, prop):
-    print "Indicator Modified:       %s %s %s %s" % \
-        (server, indicator, typ, prop)
+def indicator_added(listener, server, indicator):
+    print "Indicator Added:          %s %s" % \
+        (server, indicator)
+
+def indicator_removed(listener, server, indicator):
+    print "Indicator Removed:        %s %s" % \
+        (server, indicator)
+
+def indicator_modified(listener, server, indicator, prop):
+    print "Indicator Modified:       %s %s %s" % \
+        (server, indicator, prop)
     show_property(listener, server, 
                   indicator, prop)