Merge trunk.

5 files changed, 52 insertions, 131 deletions

diff --git a/debian/changelog b/debian/changelog
index 1b7581f8..53c78547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,117 +1,29 @@
-indicator-keyboard (0.0.0-0ubuntu19) saucy; urgency=low
+indicator-keyboard (0.0.0+13.10.20130821-0ubuntu1) saucy; urgency=low
 
+  [ Jeremy Bicha ]
   * debian/control:
     - Don't build-depend on vala-0.20-vapi
     - Build-depend on dbus for tests
 
- -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 15 Jul 2013 21:00:06 -0400
-
-indicator-keyboard (0.0.0-0ubuntu18) saucy; urgency=low
-
-  * Add indicator schema.
-  * Repair test fixtures.
-
- -- William Hua <william.hua@canonical.com>  Mon, 15 Jul 2013 20:37:40 -0400
-
-indicator-keyboard (0.0.0-0ubuntu17) saucy; urgency=low
-
-  * Minor fixes.
-
- -- William Hua <william.hua@canonical.com>  Thu, 27 Jun 2013 11:38:17 -0400
-
-indicator-keyboard (0.0.0-0ubuntu16) saucy; urgency=low
-
-  * Remove autopilot support.
-
- -- William Hua <william.hua@canonical.com>  Mon, 24 Jun 2013 17:13:03 -0400
-
-indicator-keyboard (0.0.0-0ubuntu15) saucy; urgency=low
-
-  * Experimental non-null support.
-
- -- William Hua <william.hua@canonical.com>  Sat, 22 Jun 2013 16:25:44 -0400
-
-indicator-keyboard (0.0.0-0ubuntu14) saucy; urgency=low
-
-  * Update indicator service manifest.
-
- -- William Hua <william.hua@canonical.com>  Thu, 20 Jun 2013 15:20:09 -0400
-
-indicator-keyboard (0.0.0-0ubuntu13) saucy; urgency=low
-
-  * Migrate old keyboard layouts.
-
- -- William Hua <william.hua@canonical.com>  Thu, 20 Jun 2013 13:50:00 -0400
-
-indicator-keyboard (0.0.0-0ubuntu12) saucy; urgency=low
-
-  * Remove indicator-keyboard-schema.
-
- -- William Hua <william.hua@canonical.com>  Wed, 19 Jun 2013 10:15:00 -0400
-
-indicator-keyboard (0.0.0-0ubuntu11) saucy; urgency=low
-
-  * Per-window fixes.
-
- -- William Hua <william.hua@canonical.com>  Wed, 19 Jun 2013 08:52:36 -0400
-
-indicator-keyboard (0.0.0-0ubuntu10) saucy; urgency=low
-
-  * Build depend on dh-translations.
-
- -- William Hua <william.hua@canonical.com>  Fri, 14 Jun 2013 09:34:50 -0400
-
-indicator-keyboard (0.0.0-0ubuntu9) saucy; urgency=low
-
-  * dh --with translations.
-
- -- William Hua <william.hua@canonical.com>  Thu, 13 Jun 2013 17:07:42 -0400
-
-indicator-keyboard (0.0.0-0ubuntu8) saucy; urgency=low
-
-  * Build depend on libgee-dev.
-
- -- William Hua <william.hua@canonical.com>  Mon, 10 Jun 2013 15:23:33 -0400
-
-indicator-keyboard (0.0.0-0ubuntu7) saucy; urgency=low
-
-  * Translations.
-  * Use icons from theme.
-
- -- William Hua <william.hua@canonical.com>  Mon, 10 Jun 2013 12:11:14 -0400
-
-indicator-keyboard (0.0.0-0ubuntu6) saucy; urgency=low
-
-  * Require vala 0.20.
-
- -- William Hua <william.hua@canonical.com>  Wed, 15 May 2013 16:57:51 -0400
-
-indicator-keyboard (0.0.0-0ubuntu5) saucy; urgency=low
-
-  * Fix icon rendering.
-
- -- William Hua <william.hua@canonical.com>  Wed, 08 May 2013 17:01:09 -0400
-
-indicator-keyboard (0.0.0-0ubuntu4) raring; urgency=low
-
-  * Add indicator visibility schema.
-
- -- William Hua <william.hua@canonical.com>  Wed, 01 May 2013 14:53:34 -0700
-
-indicator-keyboard (0.0.0-0ubuntu3) raring; urgency=low
-
-  * Use dictionary action state.
-
- -- William Hua <william.hua@canonical.com>  Fri, 26 Apr 2013 15:03:12 -0400
-
-indicator-keyboard (0.0.0-0ubuntu2) raring; urgency=low
-
-  * GBytesIcon support.
-
- -- William Hua <william.hua@canonical.com>  Tue, 16 Apr 2013 10:45:34 -0400
-
-indicator-keyboard (0.0.0-0ubuntu1) raring; urgency=low
-
+  [ William Hua ]
   * Initial Release.
 
- -- William Hua <william.hua@canonical.com>  Wed, 03 Apr 2013 12:37:54 -0400
+  [ Mathieu Trudel-Lapierre ]
+  * Automatic snapshot from revision 102 (bootstrap)
+  * debian/control:
+    - Packaging review, add comment to developers.
+    - Fix Vcs-Bzr, Vcs-Browser.
+    - Sort Build-Depends, use trailing commas.
+    - Improve long description.
+  * debian/rules:
+    - Add DPKG_GENSYMBOLS_CHECK_LEVEL = 4.
+    - Override dh_autoreconf to run ./autogen.sh.
+    - Override dh_install to remove .la and .a files.
+    - Run dh_install with --fail-missing.
+  * debian/compat: bump to compat level 9.
+  * debian/source/format: make sure we're using format 1.0.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 103
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 21 Aug 2013 14:07:27 +0000
diff --git a/debian/compat b/debian/compat
index 45a4fb75..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
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.
diff --git a/debian/rules b/debian/rules
index c816d1da..d2bfba7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,19 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
 %:
 	dh $@ --with autoreconf,translations
+
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
+override_dh_install:
+	find debian/indicator-keyboard/usr/lib -name *.la -delete
+	find debian/indicator-keyboard/usr/lib -name *.a -delete
+	dh_install --fail-missing
+
diff --git a/debian/source/format b/debian/source/format
index 89ae9db8..d3827e75 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+1.0