* New upstream version

* debian/control:
  - set some conflicts on the old deprecated status provider binaries
  - updated Build-Depends
* debian/control, debian/*.install:
  - drop indicator-status-provider-*, those are deprecated
  - new binaries for the libmessaging-menu library
* debian/libmessaging-menu0.symbols:
  - symbol file for the new library
* Updated packaging to dh9, current standards

16 files changed, 119 insertions, 73 deletions

diff --git a/debian/changelog b/debian/changelog
index 3dc75af..6be7b09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
-indicator-messages (0.6.0-0ubuntu2) UNRELEASED; urgency=low
+indicator-messages (12.10.0-0ubuntu1) UNRELEASED; urgency=low
 
+  * New upstream version
+  * debian/control:
+    - set some conflicts on the old deprecated status provider binaries
+    - updated Build-Depends
+  * debian/control, debian/*.install:
+    - drop indicator-status-provider-*, those are deprecated
+    - new binaries for the libmessaging-menu library
+  * debian/libmessaging-menu0.symbols:
+    - symbol file for the new library
+  * Updated packaging to dh9, current standards
   * Drop gtk2 build from the packaging since support for it was 
     dropped in trunk, thanks Lars Uebernickel
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 20 Jun 2012 18:59:18 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 21 Aug 2012 18:17:34 +0200
 
 indicator-messages (0.6.0-0ubuntu1) precise; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 94838f0..e55da18 100644
--- a/debian/control
+++ b/debian/control
@@ -4,18 +4,19 @@ Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni@debian.org>
-Build-Depends: debhelper (>= 5.0),
-               cdbs (>= 0.4.41),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               libgtk-3-dev,
+               dh-translations,
+               libgtk-3-dev (>= 3.5.12),
                libdbus-glib-1-dev,
                intltool,
-               libindicate-dev (>= 0.6.90),
-               libindicate-gtk3-dev (>= 0.6.90),
-               libindicator3-dev (>= 0.3.90),
+               libindicator3-dev,
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
-               libtelepathy-glib-dev (>= 0.9.0)
+               libtelepathy-glib-dev (>= 0.9.0),
+               gobject-introspection (>= 0.9.12-4~),
+               libgirepository1.0-dev (>= 0.9.12),
+               gtk-doc-tools
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-messages
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
@@ -24,64 +25,51 @@ Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubun
 Package: indicator-messages
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: indicator-applet | indicator-renderer, indicator-status-provider-mc5
+Recommends: indicator-applet | indicator-renderer
+Replaces: libindicator-messages-status-provider1,
+          libindicator-messages-status-provider-dev,
+          indicator-status-provider-mc5,
+          indicator-status-provider-pidgin,
+          indicator-status-provider-telepathy,
+          indicator-status-provider-emesene
+Conflicts: libindicator-messages-status-provider1,
+           libindicator-messages-status-provider-dev,
+           indicator-status-provider-mc5,
+           indicator-status-provider-pidgin,
+           indicator-status-provider-telepathy,
+           indicator-status-provider-emesene
 Description: indicator that collects messages that need a response
  A place on the user's desktop that collects messages that need a response.
  This menu provides a condensed and collected view of all of those messages
  for quick access, but without making them annoying in times that you want
  to ignore them.
 
-Package: libindicator-messages-status-provider1
+Package: libmessaging-menu0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: indicator status provider - shared library
+Description: Messaging Menu - shared library
  This library contains information to build status providers to go into
  the messaging menu.
 
-Package: libindicator-messages-status-provider-dev
+Package: libmessaging-menu-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libindicator-messages-status-provider1 (= ${binary:Version})
-Description: indicator status provider - library development files
+         libmessaging-menu0 (=${binary:Version}),
+         libglib2.0-dev
+Description: Messaging Menu - library development files
  This library contains information to build status providers to go into
  the messaging menu.
 
-Package: indicator-status-provider-mc5
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         indicator-messages (>= 0.4.92)
-Description: indicator-messages status provider for telepathy mission-control-5
- A status provider for indicator-messages to update your desktop presence 
- from telepathy mission-control-5.
-
-Package: indicator-status-provider-pidgin
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         indicator-messages (>= 0.4.92)
-Description: indicator-messages status provider for pidgin 
- A status provider for indicator-messages to update your desktop presence 
- from pidgin.
-
-Package: indicator-status-provider-telepathy
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         indicator-messages (>= 0.4.92)
-Description: indicator-messages status provider for telepathy (pre-mc5)
- A status provider for indicator-messages to update your desktop presence 
- from telepathy (pre-mc5).
-
-Package: indicator-status-provider-emesene
+Package: gir1.2-messagingmenu-1.0
+Section: libs
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         indicator-messages (>= 0.4.92)
-Description: indicator-messages status provider for emesene 
- A status provider for indicator-messages to update your desktop presence 
- from emesene.
+Depends: ${misc:Depends},
+         ${gir:Depends}
+Description: Messaging Menu - gir bindings
+ .
+ This package can be used by other packages using the GIRepository format
+ to generate dynamic bindings.
diff --git a/debian/gir1.2-messagingmenu-1.0.install b/debian/gir1.2-messagingmenu-1.0.install
new file mode 100644
index 0000000..c1d8cfe
--- /dev/null
+++ b/debian/gir1.2-messagingmenu-1.0.install
@@ -0,0 +1 @@
+usr/lib/girepository-1.0/*.typelib
diff --git a/debian/indicator-messages.install b/debian/indicator-messages.install
index ccb15ce..52aa72b 100644
--- a/debian/indicator-messages.install
+++ b/debian/indicator-messages.install
@@ -1,4 +1,5 @@
-debian/tmp/usr/lib/indicators3 /usr/lib/
-debian/tmp/usr/lib/indicator-messages/indicator-messages-service /usr/lib/indicator-messages/
-debian/tmp/usr/share/dbus-1 /usr/share/
-debian/tmp/usr/share/libindicator /usr/share/
+usr/lib/indicators3
+usr/lib/indicator-messages/indicator-messages-service
+usr/share/dbus-1
+usr/share/glib-2.0
+usr/share/libindicator
diff --git a/debian/indicator-status-provider-emesene.install b/debian/indicator-status-provider-emesene.install
deleted file mode 100644
index c01ab0b..0000000
--- a/debian/indicator-status-provider-emesene.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/indicator-messages/status-providers/1/libemesene.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/indicator-status-provider-mc5.install b/debian/indicator-status-provider-mc5.install
deleted file mode 100644
index 8778c00..0000000
--- a/debian/indicator-status-provider-mc5.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/indicator-messages/status-providers/1/libmc5.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/indicator-status-provider-pidgin.install b/debian/indicator-status-provider-pidgin.install
deleted file mode 100644
index 45f7b9b..0000000
--- a/debian/indicator-status-provider-pidgin.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/indicator-messages/status-providers/1/libpidgin.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/indicator-status-provider-telepathy.install b/debian/indicator-status-provider-telepathy.install
deleted file mode 100644
index 69e0964..0000000
--- a/debian/indicator-status-provider-telepathy.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/indicator-messages/status-providers/1/libtelepathy.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/libindicator-messages-status-provider-dev.install b/debian/libindicator-messages-status-provider-dev.install
deleted file mode 100644
index e1fdad8..0000000
--- a/debian/libindicator-messages-status-provider-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libindicator-messages-status-provider.so /usr/lib/
-debian/tmp/usr/include /usr/
-debian/tmp/usr/lib/pkgconfig /usr/lib/
diff --git a/debian/libindicator-messages-status-provider1.install b/debian/libindicator-messages-status-provider1.install
deleted file mode 100644
index dad5858..0000000
--- a/debian/libindicator-messages-status-provider1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libindicator-messages-status-provider.so.* /usr/lib/
diff --git a/debian/libindicator-messages-status-provider1.symbols b/debian/libindicator-messages-status-provider1.symbols
deleted file mode 100644
index be2e86a..0000000
--- a/debian/libindicator-messages-status-provider1.symbols
+++ /dev/null
@@ -1,4 +0,0 @@
-libindicator-messages-status-provider.so.1 libindicator-messages-status-provider1 #MINVER#
- status_provider_get_status@Base 0.4.92
- status_provider_get_type@Base 0.4.92
- status_provider_set_status@Base 0.4.92
diff --git a/debian/libmessaging-menu-dev.install b/debian/libmessaging-menu-dev.install
new file mode 100644
index 0000000..33c24a0
--- /dev/null
+++ b/debian/libmessaging-menu-dev.install
@@ -0,0 +1,4 @@
+usr/lib/libmessaging-menu.so 
+usr/lib/pkgconfig
+usr/include /usr/
+usr/share/gir-1.0/
diff --git a/debian/libmessaging-menu0.install b/debian/libmessaging-menu0.install
new file mode 100644
index 0000000..54b098e
--- /dev/null
+++ b/debian/libmessaging-menu0.install
@@ -0,0 +1 @@
+usr/lib/libmessaging-menu.so.* /usr/lib/
diff --git a/debian/libmessaging-menu0.symbols b/debian/libmessaging-menu0.symbols
new file mode 100644
index 0000000..0b910ea
--- /dev/null
+++ b/debian/libmessaging-menu0.symbols
@@ -0,0 +1,49 @@
+libmessaging-menu.so.0 libmessaging-menu0 #MINVER#
+ g_tuple_action_get_type@Base 12.10.0
+ g_tuple_action_new@Base 12.10.0
+ g_tuple_action_set_child@Base 12.10.0
+ indicator_messages_service_call_register_application@Base 12.10.0
+ indicator_messages_service_call_register_application_finish@Base 12.10.0
+ indicator_messages_service_call_register_application_sync@Base 12.10.0
+ indicator_messages_service_call_set_status@Base 12.10.0
+ indicator_messages_service_call_set_status_finish@Base 12.10.0
+ indicator_messages_service_call_set_status_sync@Base 12.10.0
+ indicator_messages_service_call_unregister_application@Base 12.10.0
+ indicator_messages_service_call_unregister_application_finish@Base 12.10.0
+ indicator_messages_service_call_unregister_application_sync@Base 12.10.0
+ indicator_messages_service_complete_register_application@Base 12.10.0
+ indicator_messages_service_complete_set_status@Base 12.10.0
+ indicator_messages_service_complete_unregister_application@Base 12.10.0
+ indicator_messages_service_emit_status_changed@Base 12.10.0
+ indicator_messages_service_get_type@Base 12.10.0
+ indicator_messages_service_interface_info@Base 12.10.0
+ indicator_messages_service_override_properties@Base 12.10.0
+ indicator_messages_service_proxy_get_type@Base 12.10.0
+ indicator_messages_service_proxy_new@Base 12.10.0
+ indicator_messages_service_proxy_new_finish@Base 12.10.0
+ indicator_messages_service_proxy_new_for_bus@Base 12.10.0
+ indicator_messages_service_proxy_new_for_bus_finish@Base 12.10.0
+ indicator_messages_service_proxy_new_for_bus_sync@Base 12.10.0
+ indicator_messages_service_proxy_new_sync@Base 12.10.0
+ indicator_messages_service_skeleton_get_type@Base 12.10.0
+ indicator_messages_service_skeleton_new@Base 12.10.0
+ 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_type@Base 12.10.0
+ messaging_menu_app_has_source@Base 12.10.0
+ messaging_menu_app_insert_source@Base 12.10.0
+ messaging_menu_app_insert_source_with_count@Base 12.10.0
+ messaging_menu_app_insert_source_with_string@Base 12.10.0
+ messaging_menu_app_insert_source_with_time@Base 12.10.0
+ 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_source@Base 12.10.0
+ messaging_menu_app_set_source_count@Base 12.10.0
+ messaging_menu_app_set_source_string@Base 12.10.0
+ 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
diff --git a/debian/rules b/debian/rules
index 8f7e68b..f95c56a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,15 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
+%:
+	dh $@ --with autoreconf,translations
 
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+override_dh_auto_configure:
+	dh_auto_configure -- --libdir="\$${prefix}/lib" --libexecdir="\$${prefix}/lib/indicator-messages"
 
-common-install-arch::
-	find debian/tmp -name \*.la -delete
-	cd po; intltool-update --pot --verbose
+override_dh_makeshlibs:
+	dh_makeshlibs -plibmessaging-menu0 -V'libmessaging-menu0 (>= 12.10.0)' -- -c4
+	dh_makeshlibs -Nlibmessaging-menu0
+
+override_dh_install:
+	find debian/tmp/usr/lib -name *.la -delete
+	dh_install --fail-missing