12 files changed, 165 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index b9a9ce0..684e194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,57 @@
+indicator-messages (0.4.92-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Added Replaces indicator-me
+    - Added build depends for libtelepathy-glib-dev
+    - Added new binary packages, libindicator-messages-status-provider-dev,
+      libindicator-messages-status-provider1, and each provider
+    - Make indicator-messages recommend indicator-status-provider-mc5
+  * debian/libindicator-messages-status-provider1.symbols
+    - Added symbols file
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 14 Jul 2011 16:28:23 -0400
+
+indicator-messages (0.4.91-0ubuntu1) oneiric; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Update for libindicator 0.4
+
+  [ Ken VanDine ]
+  * debian/control
+    - Bumped build depends for libindicator to >= 0.3.90
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 08 Jul 2011 11:23:58 -0400
+
+indicator-messages (0.4.90-0ubuntu2) oneiric; urgency=low
+
+  * Rebuild for libdbusmenu-gtk3-4
+  * debian/control
+    - Removed duplicate build depends
+    - Dropped build depends on indicator-messages-gtk2
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 28 Jun 2011 09:01:12 -0400
+
+indicator-messages (0.4.90-0ubuntu1) oneiric; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * GTK 3
+
+  [ Ken VanDine ]
+  * debian/control
+    - Bumped standards version to 3.9.2
+    - Add new binary for indicator-messages-gtk2 
+    - Make indicator-messages recommend indicator-messages-gtk2 (until unity 
+      can load gtk3 indicators)
+    - indicator-messages-gtk2 replaces indicator-messages << 0.4.90
+    - Added build depends for libdbusmenu-gtk3-dev and libindicator3-dev
+  * debian/rules
+    - build for both gtk2 and gtk3
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 22 Jun 2011 12:34:43 -0400
+
 indicator-messages (0.4.0-1) unstable; urgency=low
 
   * Merge new upstream from Ubuntu.
diff --git a/debian/control b/debian/control
index c3727fc..dc8e19b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,107 @@
 Source: indicator-messages
 Section: gnome
 Priority: optional
-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+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),
                libgtk2.0-dev (>= 2.12.0),
+               libgtk-3-dev,
                libdbus-glib-1-dev,
                gnome-doc-utils,
                scrollkeeper,
                intltool,
                libindicate-dev (>= 0.4.91),
                libindicate-gtk-dev (>= 0.4.91),
-               libindicator-dev (>= 0.3.19),
+               libindicator-dev (>= 0.3.90),
+               libindicator3-dev (>= 0.3.90),
+               libdbusmenu-glib-dev (>= 0.3.94),
                libdbusmenu-gtk-dev (>= 0.3.94),
-               libdbusmenu-glib-dev (>= 0.3.94)
+               libdbusmenu-gtk3-dev (>= 0.3.94),
+               libtelepathy-glib-dev (>= 0.9.0)
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/indicator-messages
-Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/indicator-messages/debian
-Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/indicator-messages/debian
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu/files
 
 Package: indicator-messages
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: indicator-applet | indicator-renderer, indicator-status-provider-mc5
+Replaces: indicator-me
+Breaks: indicator-applet (<< 0.3.0), indicator-me
+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: indicator-messages-gtk2
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         indicator-messages (= ${binary:Version})
 Recommends: indicator-applet | indicator-renderer
+Replaces: indicator-messages (<< 0.4.90)
 Breaks: indicator-applet (<< 0.3.0)
 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
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: indicator status provider - shared library
+ This library contains information to build status providers to go into
+ the messaging menu.
+
+Package: libindicator-messages-status-provider-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libindicator-messages-status-provider1 (= ${binary:Version})
+Description: indicator status provider - 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
+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.
diff --git a/debian/indicator-messages-gtk2.install b/debian/indicator-messages-gtk2.install
new file mode 100644
index 0000000..8d1fc9f
--- /dev/null
+++ b/debian/indicator-messages-gtk2.install
@@ -0,0 +1 @@
+debian/tmp/gtk2/usr/lib/indicators /usr/lib/
diff --git a/debian/indicator-messages.install b/debian/indicator-messages.install
new file mode 100644
index 0000000..ebbf1eb
--- /dev/null
+++ b/debian/indicator-messages.install
@@ -0,0 +1,4 @@
+debian/tmp/gtk3/usr/lib/indicators3 /usr/lib/
+debian/tmp/gtk3/usr/lib/indicator-messages/indicator-messages-service /usr/lib/indicator-messages/
+debian/tmp/gtk3/usr/share/dbus-1 /usr/share/
+debian/tmp/gtk3/usr/share/libindicator /usr/share/
diff --git a/debian/indicator-status-provider-emesene.install b/debian/indicator-status-provider-emesene.install
new file mode 100644
index 0000000..3a16809
--- /dev/null
+++ b/debian/indicator-status-provider-emesene.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/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
new file mode 100644
index 0000000..e8d3f25
--- /dev/null
+++ b/debian/indicator-status-provider-mc5.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/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
new file mode 100644
index 0000000..701f499
--- /dev/null
+++ b/debian/indicator-status-provider-pidgin.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/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
new file mode 100644
index 0000000..8a3b666
--- /dev/null
+++ b/debian/indicator-status-provider-telepathy.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/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
new file mode 100644
index 0000000..1b53b59
--- /dev/null
+++ b/debian/libindicator-messages-status-provider-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/gtk3/usr/lib/libindicator-messages-status-provider.so /usr/lib/
+debian/tmp/gtk3/usr/include /usr/
+debian/tmp/gtk3/usr/lib/pkgconfig /usr/lib/
diff --git a/debian/libindicator-messages-status-provider1.install b/debian/libindicator-messages-status-provider1.install
new file mode 100644
index 0000000..cdf5aa3
--- /dev/null
+++ b/debian/libindicator-messages-status-provider1.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/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
new file mode 100644
index 0000000..be2e86a
--- /dev/null
+++ b/debian/libindicator-messages-status-provider1.symbols
@@ -0,0 +1,4 @@
+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/rules b/debian/rules
index e813915..0105586 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,21 @@
 #!/usr/bin/make -f
 
+DEB_BUILDDIR = build
+DEB_MAKE_FLAVORS = gtk2 gtk3
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
+DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
+
+DEB_CONFIGURE_FLAGS_gtk2 = --with-indicator-gtk=2
+DEB_CONFIGURE_FLAGS_gtk3 = --with-indicator-gtk=3
+
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-binary-install/indicator-messages::
-	# remove .a/.la clutter
-	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a
-	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la
+debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
+debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
+
+common-install-arch::
+	find debian/tmp -name \*.la -delete