Re-do merge

5 files changed, 25 insertions, 8 deletions

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..6a54911 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 13.10.1+13.10.20130820
  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