Merging in the ubuntu-desktop branch.

3 files changed, 44 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 01116cf..274756f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,42 @@
+indicator-session (0.1.7+r58-0ubuntu1) lucid; urgency=low
+
+  * New snapshot for libindicator 0.3.0
+  * debian/control
+    - build depend on libtelepathy-glib-dev instead of libempathy-dev
+    - build depend on libindicator-dev >= 0.3.0
+  * removed 03_tp_glib.patch and 99_autoreconf.patch, applied upstream
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 10 Dec 2009 10:42:21 -0500
+
+indicator-session (0.1.7-0ubuntu5) lucid; urgency=low
+
+  * debian/patches/03_tp_glib.patch
+    - Updated patch to properly work with TpAccountManager 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 08 Dec 2009 11:01:38 -0500
+
+indicator-session (0.1.7-0ubuntu4) lucid; urgency=low
+
+  * debian/patches/02_mc5-fixes.patch
+    - Renamed the patch for ordering
+  * debian/patches/03_tp_glib.patch
+    - Port from libempathy to telepathy-glib (LP: #461367)
+  * debian/patches/99_autoreconf.patch
+    - autoreconf for telepathy change
+  * debian/control
+    - build depend on libtelepathy-glib-dev instead of libempathy-dev
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 08 Dec 2009 08:58:06 -0500
+
+indicator-session (0.2.0~dev-0ubuntu1~ppa2) karmic; urgency=low
+
+  * debian/rules
+    - removed the extra disable-scrollkeeper arg to configure (LP: #418772)
+  * debian/control
+    - removed the build dep for scrollkeeper
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 06 Nov 2009 10:24:06 -0500
+
 indicator-session (0.2.0~dev-0ubuntu1~ppa1) karmic; urgency=low
 
   * Updating to the libindicate 0.3.0 API
diff --git a/debian/control b/debian/control
index a4f2be7..964bbbb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,12 @@ Build-Depends: debhelper (>= 5.0),
                libgconf2-dev,
                libdbus-glib-1-dev,
                gnome-doc-utils,
-               scrollkeeper,
-               libindicator-dev (>= 0.3.0~dev),
+               libindicator-dev (>= 0.3.0),
                libdbusmenu-glib-dev (>= 0.1.2),
                libdbusmenu-gtk-dev (>= 0.1.2),
                libpolkit-gobject-1-dev,
                intltool,
-               libempathy-dev (>= 2.27.0)
+               libtelepathy-glib-dev (>= 0.9.0)
 Standards-Version: 3.8.2
 Homepage: https://launchpad.net/indicator-session
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu
@@ -28,9 +27,9 @@ Replaces: indicator-sus
 Description: An indicator showing session management, status and user switching.
  .
  This indicator is designed to be placed on the right side of a panel and
- give the user easy control for changing their instant message status.  Switching
- to another user.  Starting a guest session.  Or controlling the status of
- their own session.
+ give the user easy control for changing their instant message status.  
+ Switching to another user.  Starting a guest session.  Or controlling the
+ status of their own session.
  .
  It requires some way to be hosted into a panel.  For the GNOME Panel the
  appropriate package is indicator-applet-session.
diff --git a/debian/rules b/debian/rules
index b632517..8db591a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators