4 files changed, 50 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index ea25fee..62f5111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+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
+
+  * Merging in the branch that adds in the status icons to
+    the panel.
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 17 Aug 2009 09:08:53 -0500
+
+indicator-sus (0.1-0ubuntu2) UNRELEASE; urgency=low
+
+  * Fixed Vcs-Bzr location, part of the  indicator-applet project
+  * specify Vcs-Bzr-Browser
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 11 Aug 2009 17:26:15 +0200
+
+indicator-sus (0.1-0ubuntu1) karmic; urgency=low
+
+  * Include icons in the tarball
+  * Added license files
+  * Corrected the FSF address
+  * debian/control
+    - Set Homepage and Vcs-Bzr
+  * Added debian/watch 
+  * Changed conflicts for gdm to <= 2.27.4-0ubuntu9
+  * Depend on indicator-applet >= 0.2
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 11 Aug 2009 09:53:56 -0400
+
 indicator-sus (0.1~ppa6) karmic; urgency=low
 
   * debian/control: Conflicting with gdm < 2.27.4-0ubuntu9 or
diff --git a/debian/control b/debian/control
index 1a33a51..4c76aa7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: indicator-sus
+Source: indicator-session
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
@@ -13,11 +13,14 @@ Build-Depends: debhelper (>= 5.0),
                libdbusmenu-gtk-dev,
                libpolkit-gnome-dev,
                intltool
-Standards-Version: 3.8.0
+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
 
-Package: indicator-sus
+Package: indicator-session
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet, devicekit-power
-Conflicts: gdm (< 2.27.4-0ubuntu9)
-Description: Applet for the GNOME panel providing various indicators for
- display to users.
+Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet (>= 0.2), devicekit-power, gdm
+Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
+Replaces: indicator-sus
+Description: An indicator providing session management, status control and user switching.
diff --git a/debian/rules b/debian/rules
index 22338be..7f46594 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ include /usr/share/cdbs/1/class/gnome.mk
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators
+
 binary-install/indicator-sus::
 	# remove .a/.la clutter
 	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..22a7bca
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/indicator-applet/+download .*/indicator-session-([0-9.]+)\.tar\.gz