Merge in phablet branch.

Approved by PS Jenkins bot, Pete Woods.

6 files changed, 128 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 9ce8e81..6544d6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+indicator-messages (13.10.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * Bumping version to ensure we override all PPAs when this lands
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 19 Aug 2013 10:09:40 -0500
+
+indicator-messages (13.10.0phablet1) raring; urgency=low
+
+  * Version bump to not pull from archives
+
+ -- Sergio Schvezov <sergio.schvezov@canonical.com>  Fri, 26 Apr 2013 13:53:53 -0300
+
 indicator-messages (12.10.6+13.10.20130702-0ubuntu1) saucy; urgency=low
 
   [ Mathias Dietrich ]
@@ -8,6 +20,12 @@ indicator-messages (12.10.6+13.10.20130702-0ubuntu1) saucy; urgency=low
 
  -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 02 Jul 2013 02:02:36 +0000
 
+indicator-messages (12.10.6phablet1) quantal; urgency=low
+
+  * Adding guards for g_type_init
+
+ -- Sergio Schvezov <sergio.schvezov@canonical.com>  Fri, 22 Mar 2013 17:23:45 -0300
+
 indicator-messages (12.10.6daily13.06.19-0ubuntu1) saucy; urgency=low
 
   [ Sebastien Bacher ]
@@ -121,6 +139,91 @@ indicator-messages (12.10.6daily12.11.21.1-0ubuntu1) raring; urgency=low
 
  -- Automatic PS uploader <ps-jenkins@lists.canonical.com>  Wed, 21 Nov 2012 10:41:37 +0000
 
+indicator-messages (12.10.6-0ubuntu1phablet9) quantal; urgency=low
+
+  * add "remove-all" signal to imapplicationlist (temporarily)
+
+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com>  Thu, 20 Dec 2012 18:49:50 +0100
+
+indicator-messages (12.10.6-0ubuntu1phablet8) quantal; urgency=low
+
+  * Make messaging_menu_app_remove_message() work for messages with a ref count of 1
+  * Make handling of multiple processes with the same desktop id more robust
+  * ImPhoneMenu: sort messages by time (fixes LP #1090266)
+  * Don't show message sources
+
+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com>  Mon, 17 Dec 2012 14:42:03 +0100
+
+indicator-messages (12.10.6-0ubuntu1phablet7) quantal; urgency=low
+
+  * Remove variant wrapper from 'parameter' argument of the "activate" signal
+
+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com>  Tue, 11 Dec 2012 14:28:15 +0100
+
+indicator-messages (12.10.6-0ubuntu1phablet6) quantal; urgency=low
+
+  * Don't show sources
+  * Always use the "messageitem" widget type for messages
+
+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com>  Mon, 10 Dec 2012 14:38:16 +0100
+
+indicator-messages (12.10.6-0ubuntu1phablet5) quantal; urgency=low
+
+  * Don't shorten the app id to seven characters (fixes LP #1086729)
+  * Add messaging_menu_app_get_message
+
+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com>  Thu, 06 Dec 2012 15:06:34 +0000
+
+indicator-messages (12.10.6-0ubuntu1phablet4) quantal; urgency=low
+
+  [Lars Uebernickel]
+  * Add the concept of actions to messages
+  * Stop using IndicatorService
+  * Reverse order of messages
+  * Expose symbolic application icon
+  * Change icon when there are any messages in the menu
+
+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com>  Tue, 04 Dec 2012 21:10:26 +0000
+
+indicator-messages (12.10.6-0ubuntu1phablet3) quantal; urgency=low
+
+  [Lars Uebernickel]
+  * expose root menu item of which the indicator menu is a submenu
+  * fix crash in im-application-list on arm
+
+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com>  Thu, 29 Nov 2012 21:44:19 +0100
+
+indicator-messages (12.10.6-0ubuntu1phablet2) quantal; urgency=low
+
+  [Lars Uebernickel]
+  * refactor messages-service.c
+  * notify applications about message and source activations
+  * add "Clear All" menu item
+  * allow dismissing of messages
+  * include application icons on message items
+
+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com>  Mon, 26 Nov 2012 22:19:51 +0100
+
+indicator-messages (12.10.6-0ubuntu1phablet1) quantal; urgency=low
+
+  [ Mathieu Trudel-Lapierre ]
+  * debian/rules:
+    - Use autogen.sh for dh_autoreconf.
+    - Drop the override for dh_makeshlibs.
+    - Add DPKG_GENSYMBOLS_CHECK_LEVEL=4.
+  * debian/control:
+    - Fix styling: add trailing commas at the end of lists. 
+    - Update Vcs-Bzr, Vcs-Browser fields and add a notice for developers.
+    - Add libgtest-dev to Build-Depends.
+  * Automatic snapshot from revision 329 (bootstrap):
+    - Clear the detail (count or time) of a source when another type of detail
+      is set. (LP: #1071640)
+
+  [ Ricardo Mendoza ]
+  * Releasing upstream for phablet
+
+ -- Ricardo Mendoza <ricardo.mendoza@canonical.com>  Tue, 20 Nov 2012 10:08:59 -0430
+
 indicator-messages (12.10.5-0ubuntu2) raring; urgency=low
 
   * Upload to raring
diff --git a/debian/control b/debian/control
index 7773476..47d4c0e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,19 +7,19 @@ Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                dh-translations,
-               libglib2.0-dev (>= 2.35.4),
-               libgtk-3-dev (>= 3.5.12),
-               libdbus-glib-1-dev,
+               gobject-introspection (>= 0.9.12-4~),
+               gtk-doc-tools,
                intltool,
-               libindicator3-dev,
+               libdbus-glib-1-dev,
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
-               libtelepathy-glib-dev (>= 0.9.0),
-               gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.12),
-               gtk-doc-tools,
                libgtest-dev,
+               libgtk-3-dev (>= 3.5.18),
+               libindicator3-dev,
+               libtelepathy-glib-dev (>= 0.9.0),
                python3-dbusmock,
+               valac,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-messages
 # If you aren't a member of ~indicator-applet-developers but need to upload
diff --git a/debian/indicator-messages.install b/debian/indicator-messages.install
index c0f6e98..39c40f5 100644
--- a/debian/indicator-messages.install
+++ b/debian/indicator-messages.install
@@ -1,5 +1,5 @@
-usr/lib/indicators3
 usr/lib/indicator-messages/indicator-messages-service
 usr/share/dbus-1
 usr/share/glib-2.0
 usr/share/icons
+usr/share/unity/indicators
diff --git a/debian/libmessaging-menu-dev.install b/debian/libmessaging-menu-dev.install
index 75ef089..53e0312 100644
--- a/debian/libmessaging-menu-dev.install
+++ b/debian/libmessaging-menu-dev.install
@@ -2,4 +2,5 @@ usr/lib/libmessaging-menu.so
 usr/lib/pkgconfig
 usr/include /usr/
 usr/share/gir-1.0/
+usr/share/vala/
 usr/share/gtk-doc
diff --git a/debian/libmessaging-menu0.symbols b/debian/libmessaging-menu0.symbols
index 6261a2a..d5eaed1 100644
--- a/debian/libmessaging-menu0.symbols
+++ b/debian/libmessaging-menu0.symbols
@@ -1,9 +1,11 @@
 libmessaging-menu.so.0 libmessaging-menu0 #MINVER#
+ messaging_menu_app_append_message@Base 12.10.6-0ubuntu1phablet1
  messaging_menu_app_append_source@Base 12.10.0
  messaging_menu_app_append_source_with_count@Base 12.10.0
  messaging_menu_app_append_source_with_string@Base 12.10.0
  messaging_menu_app_append_source_with_time@Base 12.10.0
  messaging_menu_app_draw_attention@Base 12.10.0
+ messaging_menu_app_get_message@Base 0replaceme
  messaging_menu_app_get_type@Base 12.10.0
  messaging_menu_app_has_source@Base 12.10.0
  messaging_menu_app_insert_source@Base 12.10.0
@@ -13,6 +15,8 @@ libmessaging-menu.so.0 libmessaging-menu0 #MINVER#
  messaging_menu_app_new@Base 12.10.0
  messaging_menu_app_register@Base 12.10.0
  messaging_menu_app_remove_attention@Base 12.10.0
+ messaging_menu_app_remove_message@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_app_remove_message_by_id@Base 12.10.6-0ubuntu1phablet1
  messaging_menu_app_remove_source@Base 12.10.0
  messaging_menu_app_set_source_count@Base 12.10.0
  messaging_menu_app_set_source_icon@Base 12.10.2
@@ -21,3 +25,14 @@ libmessaging-menu.so.0 libmessaging-menu0 #MINVER#
  messaging_menu_app_set_source_time@Base 12.10.0
  messaging_menu_app_set_status@Base 12.10.0
  messaging_menu_app_unregister@Base 12.10.0
+ messaging_menu_message_add_action@Base 12.10.6-0ubuntu1phablet3
+ messaging_menu_message_get_body@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_message_get_draws_attention@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_message_get_icon@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_message_get_id@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_message_get_subtitle@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_message_get_time@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_message_get_title@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_message_get_type@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_message_new@Base 12.10.6-0ubuntu1phablet1
+ messaging_menu_message_set_draws_attention@Base 12.10.6-0ubuntu1phablet1
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0