4 files changed, 51 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 26c8aee..e1f55bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+indicator-applet (0.2.0~bzr319-0ubuntu5~ppa4) UNRELEASED; urgency=low
+
+  * Merging onto the main packaging branch.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 07 Aug 2009 19:01:57 +0100
+
+indicator-applet (0.2.0~bzr319-0ubuntu5~ppa3) karmic; urgency=low
+
+  * Renaming the second Bonobo server description file to match that
+    of the FastUserSwitchApplet.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 07 Aug 2009 18:50:33 +0100
+
+indicator-applet (0.2.0~bzr319-0ubuntu5~ppa2) karmic; urgency=low
+
+  * Upstream merge for better naming of the applet.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 07 Aug 2009 18:40:22 +0100
+
+indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) karmic; urgency=low
+
+  * Updating from upstream with two (count them) two applets
+    installed in the source.
+  * debian/control: Adding information on indicator-applet-sus which
+    is a different applet for the SUS indicator.
+  * debian/indicator-applet.install: Making it more specific so that
+    it doesn't grab the directories that now have additional files
+    created by indicator-applet-sus existing.
+  * debian/indicator-applet-sus.install: List files that are now
+    used by the new binary package.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 07 Aug 2009 18:39:59 +0100
+
 indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low
 
   * Add build-dep on gtk-doc-tools
diff --git a/debian/control b/debian/control
index 4281a15..86c1447 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,19 @@ Description: GNOME panel indicator applet
  Currently this includes support for messaging applications in the
  indicator-messages package.
 
+Package: indicator-applet-sus
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-panel,
+         indicator-applet (= ${binary:Version})
+Description: A clone of the GNOME panel indicator applet.
+ Indicator-applet is an applet to display information from
+ various applications consistently in the GNOME panel. 
+ .
+ This instance will only load the SUS indicator which provies
+ status changing, user choosing and session management.
+
 Package: libindicate2
 Section: libs
 Conflicts: libindicate
diff --git a/debian/indicator-applet-sus.install b/debian/indicator-applet-sus.install
new file mode 100644
index 0000000..3a016e0
--- /dev/null
+++ b/debian/indicator-applet-sus.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/bonobo/servers/GNOME_FastUserSwitchApplet.server
+debian/tmp/usr/lib/indicator-applet/indicator-applet-sus
diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install
index a6e5326..772d432 100644
--- a/debian/indicator-applet.install
+++ b/debian/indicator-applet.install
@@ -1,4 +1,4 @@
-debian/tmp/etc
-debian/tmp/usr/lib/bonobo
-debian/tmp/usr/lib/indicator-applet
+debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorApplet.server
+debian/tmp/usr/lib/indicator-applet/indicator-applet
+debian/tmp/usr/lib/indicator-applet/listen-and-print
 debian/tmp/usr/share/icons