Merge trunk.

1 files changed, 17 insertions, 14 deletions

diff --git a/debian/control b/debian/control
index 4f5289ac..b9757366 100644
--- a/debian/control
+++ b/debian/control
@@ -3,34 +3,37 @@ Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: William Hua <william.hua@canonical.com>
-Build-Depends: quilt,
-               debhelper (>= 9.0.0),
+Build-Depends: debhelper (>= 9.0.0),
+               quilt,
                dh-autoreconf,
                dh-translations,
-               libgirepository1.0-dev,
-               valac,
+               dbus,
+               libaccountsservice-dev,
+               libbamf3-dev,
                libgee-dev,
-               libgtk-3-dev,
+               libgirepository1.0-dev,
                libgnome-desktop-3-dev,
                libgnomekbd-dev,
+               libgtk-3-dev,
                libibus-1.0-dev (>= 1.5.0),
-               libaccountsservice-dev,
                liblightdm-gobject-1-dev,
-               libbamf3-dev,
-               dbus,
+               valac,
+               xauth,
                xvfb,
-               xauth
 Standards-Version: 3.9.4
 Homepage: https://code.launchpad.net/indicator-keyboard
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead. ~indicator-applet-developers will notice
 # and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~attente/indicator-keyboard/trunk
-Vcs-Browser: https://bazaar.launchpad.net/~attente/indicator-keyboard/trunk/files
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-keyboard/trunk
+Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-develpers/indicator-keyboard/trunk/files
 
 Package: indicator-keyboard
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Description: Keyboard indicator
- This package contains the keyboard indicator.
+ This package contains the keyboard indicator, which should show as an icon in
+ the top panel when using the Unity environment. It can be used to switch
+ key layouts or languages, and helps the user identifying which layouts are
+ currently in use.