Merge from U. Desktop

7 files changed, 59 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 22b4f8b..4f25cc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,27 @@
-indicator-messages (0.4.91-0ubuntu1~ppa1) oneiric; urgency=low
+indicator-messages (0.4.92-0ubuntu1) UNRELEASED; 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
+      and libindicator-messages-status-provider1
+  * 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
 
- -- Ted Gould <ted@ubuntu.com>  Fri, 08 Jul 2011 09:54:54 -0500
+  [ 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
 
diff --git a/debian/control b/debian/control
index 89a09b8..cda9a65 100644
--- a/debian/control
+++ b/debian/control
@@ -14,11 +14,12 @@ Build-Depends: debhelper (>= 5.0),
                intltool,
                libindicate-dev (>= 0.4.91),
                libindicate-gtk-dev (>= 0.4.91),
-               libindicator-dev (>= 0.3.19),
-               libindicator3-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-gtk3-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://code.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
@@ -28,7 +29,8 @@ Package: indicator-messages
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: indicator-applet | indicator-renderer
-Breaks: indicator-applet (<< 0.3.0)
+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
@@ -48,3 +50,27 @@ Description: indicator 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 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-provider-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libindicator-messages-status-provider1 (= ${binary:Version})
+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.
+
diff --git a/debian/indicator-messages.install b/debian/indicator-messages.install
index 19a45de..16db366 100644
--- a/debian/indicator-messages.install
+++ b/debian/indicator-messages.install
@@ -1 +1,2 @@
-debian/tmp/gtk3/usr /
+debian/tmp/gtk3/usr/lib/indicators3 /usr/lib/
+debian/tmp/gtk3/usr/lib/indicator-messages /usr/lib/
diff --git a/debian/libindicator-messages-status-provider-dev.install b/debian/libindicator-messages-status-provider-dev.install
new file mode 100644
index 0000000..61e6103
--- /dev/null
+++ b/debian/libindicator-messages-status-provider-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/gtk3/usr/lib/libindicator-messages-status-provider.so /usr/lib/
+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 219cf64..0105586 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
 
 DEB_CONFIGURE_FLAGS_gtk2 = --with-indicator-gtk=2
 DEB_CONFIGURE_FLAGS_gtk3 = --with-indicator-gtk=3
-DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
@@ -20,4 +19,3 @@ debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
 
 common-install-arch::
 	find debian/tmp -name \*.la -delete
-	find debian/tmp -name \*.a -delete