2 files changed, 15 insertions, 28 deletions
diff --git a/debian/changelog b/debian/changelog
index d54d06e..b87a5a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,36 +1,23 @@
-indicator-session (0.1~bzr17-0ubuntu1~ppa2~morestatus3) karmic; urgency=low
+indicator-session (0.1~bzr18-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
-  * Fixing status.
+  * Merging in the upstream branch which has base support for
+    status with Pidgin and Telepathy.
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 24 Aug 2009 23:48:05 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 25 Aug 2009 16:23:36 -0500
 
-indicator-session (0.1~bzr17-0ubuntu1~ppa2~morestatus2) karmic; urgency=low
-
-  * More status...
-
- -- Ted Gould <ted@ubuntu.com>  Mon, 24 Aug 2009 23:39:14 -0500
-
-indicator-session (0.1~bzr17-0ubuntu1~ppa2~morestatus1) karmic; urgency=low
-
-  * Merging in the status work branch
-
- -- Ted Gould <ted@ubuntu.com>  Sat, 22 Aug 2009 13:12:11 -0500
-
-indicator-session (0.1~bzr17-0ubuntu1~ppa1) karmic; urgency=low
-
-  * Merging in trunk with rename from 'sus' to 'session'
-  * debian/control: Switching to indicator-session and conflicting
-    and replacing indicator-sus
-  * debian/watch: Switching to indicator-session*
-
- -- Ted Gould <ted@ubuntu.com>  Tue, 18 Aug 2009 17:07:35 -0500
-
-indicator-sus (0.1-0ubuntu3~ppa1) karmic; urgency=low
+indicator-session (0.1~bzr17-0ubuntu1) UNRELEASE; urgency=low
 
+  * New snapshot (LP: #417035)
+  * Package rename from 'indicator-sus' to 'indicator-session'
   * Merging in the branch that adds in the status icons to
     the panel.
+  * debian/control:
+    - Switching to indicator-session and conflicting
+    - Changed Vcs-Bzr to point to ~ubuntu-desktop
+    and replacing indicator-sus
+  * debian/watch: Switching to indicator-session*
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 17 Aug 2009 09:08:53 -0500
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 21 Aug 2009 12:28:13 -0400
 
 indicator-sus (0.1-0ubuntu2) UNRELEASE; urgency=low
 
diff --git a/debian/control b/debian/control
index 4c76aa7..7d9b612 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 5.0),
                intltool
 Standards-Version: 3.8.2
 Homepage: https://launchpad.net/indicator-applet
-Vcs-Bzr: lp:~ubuntu-core-dev/indicator-applet/sus-ubuntu
-Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/sus-ubuntu
+Vcs-Bzr: lp:~ubuntu-desktop/indicator-applet/indicator-session-ubuntu
+Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/indicator-session-ubuntu
 
 Package: indicator-session
 Architecture: any