From a8d98f5d7aed169b87880caf0738998b348d698a Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 5 Aug 2013 13:57:24 -0400 Subject: * 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. --- debian/changelog | 128 ++++++++------------------------------------------- debian/compat | 2 +- debian/control | 43 +++++++++-------- debian/rules | 16 +++++-- debian/source/format | 2 +- 5 files changed, 54 insertions(+), 137 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b7581f8..77209792 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,117 +1,25 @@ -indicator-keyboard (0.0.0-0ubuntu19) saucy; urgency=low +indicator-keyboard (0.0.0-0ubuntu1) UNRELEASED; urgency=low + [ Jeremy Bicha ] * debian/control: - Don't build-depend on vala-0.20-vapi - Build-depend on dbus for tests - -- Jeremy Bicha 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 Mon, 15 Jul 2013 20:37:40 -0400 - -indicator-keyboard (0.0.0-0ubuntu17) saucy; urgency=low - - * Minor fixes. - - -- William Hua Thu, 27 Jun 2013 11:38:17 -0400 - -indicator-keyboard (0.0.0-0ubuntu16) saucy; urgency=low - - * Remove autopilot support. - - -- William Hua Mon, 24 Jun 2013 17:13:03 -0400 - -indicator-keyboard (0.0.0-0ubuntu15) saucy; urgency=low - - * Experimental non-null support. - - -- William Hua Sat, 22 Jun 2013 16:25:44 -0400 - -indicator-keyboard (0.0.0-0ubuntu14) saucy; urgency=low - - * Update indicator service manifest. - - -- William Hua Thu, 20 Jun 2013 15:20:09 -0400 - -indicator-keyboard (0.0.0-0ubuntu13) saucy; urgency=low - - * Migrate old keyboard layouts. - - -- William Hua Thu, 20 Jun 2013 13:50:00 -0400 - -indicator-keyboard (0.0.0-0ubuntu12) saucy; urgency=low - - * Remove indicator-keyboard-schema. - - -- William Hua Wed, 19 Jun 2013 10:15:00 -0400 - -indicator-keyboard (0.0.0-0ubuntu11) saucy; urgency=low - - * Per-window fixes. - - -- William Hua Wed, 19 Jun 2013 08:52:36 -0400 - -indicator-keyboard (0.0.0-0ubuntu10) saucy; urgency=low - - * Build depend on dh-translations. - - -- William Hua Fri, 14 Jun 2013 09:34:50 -0400 - -indicator-keyboard (0.0.0-0ubuntu9) saucy; urgency=low - - * dh --with translations. - - -- William Hua Thu, 13 Jun 2013 17:07:42 -0400 - -indicator-keyboard (0.0.0-0ubuntu8) saucy; urgency=low - - * Build depend on libgee-dev. - - -- William Hua Mon, 10 Jun 2013 15:23:33 -0400 - -indicator-keyboard (0.0.0-0ubuntu7) saucy; urgency=low - - * Translations. - * Use icons from theme. - - -- William Hua Mon, 10 Jun 2013 12:11:14 -0400 - -indicator-keyboard (0.0.0-0ubuntu6) saucy; urgency=low - - * Require vala 0.20. - - -- William Hua Wed, 15 May 2013 16:57:51 -0400 - -indicator-keyboard (0.0.0-0ubuntu5) saucy; urgency=low - - * Fix icon rendering. - - -- William Hua Wed, 08 May 2013 17:01:09 -0400 - -indicator-keyboard (0.0.0-0ubuntu4) raring; urgency=low - - * Add indicator visibility schema. - - -- William Hua Wed, 01 May 2013 14:53:34 -0700 - -indicator-keyboard (0.0.0-0ubuntu3) raring; urgency=low - - * Use dictionary action state. - - -- William Hua Fri, 26 Apr 2013 15:03:12 -0400 - -indicator-keyboard (0.0.0-0ubuntu2) raring; urgency=low - - * GBytesIcon support. - - -- William Hua Tue, 16 Apr 2013 10:45:34 -0400 - -indicator-keyboard (0.0.0-0ubuntu1) raring; urgency=low - + [ William Hua ] * Initial Release. - -- William Hua Wed, 03 Apr 2013 12:37:54 -0400 + [ Mathieu Trudel-Lapierre ] + * 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. + + -- Mathieu Trudel-Lapierre Mon, 05 Aug 2013 13:37:16 -0400 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 90eb2451..ec8a177b 100644 --- a/debian/control +++ b/debian/control @@ -3,32 +3,35 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: William Hua -Build-Depends: quilt, - debhelper (>= 9.0.0), - dh-autoreconf, - dh-translations, - libgirepository1.0-dev, - valac, - libgee-dev, - libgtk-3-dev, - libgnome-desktop-3-dev, - libgnomekbd-dev, - libibus-1.0-dev (>= 1.5.0), - libbamf3-dev, - dbus, - xvfb, - xauth +Build-Depends: + debhelper (>= 9.0.0), + quilt, + dh-autoreconf, + dh-translations, + dbus, + libbamf3-dev, + libgee-dev, + libgirepository1.0-dev, + libgnome-desktop-3-dev, + libgnomekbd-dev, + libgtk-3-dev, + libibus-1.0-dev (>= 1.5.0), + valac, + xauth, + xvfb, 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 -- cgit v1.2.3 From 6fd14a948bf391d5b64ad7a70bef8186cb329fed Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 5 Aug 2013 14:15:00 -0400 Subject: Add another missing comma --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ec8a177b..3002d3b3 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-develpers/indicator- Package: indicator-keyboard Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, Description: 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 -- cgit v1.2.3 From 2b5867901d6ac8efefe211426d93ebd374d09cea Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 5 Aug 2013 14:54:36 -0400 Subject: Fix identation for (Build-)Depends --- debian/control | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/debian/control b/debian/control index 3002d3b3..317b23ec 100644 --- a/debian/control +++ b/debian/control @@ -3,33 +3,30 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: William Hua -Build-Depends: - debhelper (>= 9.0.0), - quilt, - dh-autoreconf, - dh-translations, - dbus, - libbamf3-dev, - libgee-dev, - libgirepository1.0-dev, - libgnome-desktop-3-dev, - libgnomekbd-dev, - libgtk-3-dev, - libibus-1.0-dev (>= 1.5.0), - valac, - xauth, - xvfb, +Build-Depends: debhelper (>= 9.0.0), + quilt, + dh-autoreconf, + dh-translations, + dbus, + libbamf3-dev, + libgee-dev, + libgirepository1.0-dev, + libgnome-desktop-3-dev, + libgnomekbd-dev, + libgtk-3-dev, + libibus-1.0-dev (>= 1.5.0), + valac, + xauth, + xvfb, 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/~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: ${misc:Depends}, ${shlibs:Depends}, +Depends: ${misc:Depends}, + ${shlibs:Depends}, Description: 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 -- cgit v1.2.3 From 49783d7014a6f5342ec77f56e81aeab6954bc2ec Mon Sep 17 00:00:00 2001 From: William Hua Date: Wed, 7 Aug 2013 10:45:42 -0400 Subject: Resolve flaky test by forcing a delay. --- po/indicator-keyboard.pot | 8 ++++---- tests/main.vala | 10 ++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot index a96fdd39..4433c98f 100644 --- a/po/indicator-keyboard.pot +++ b/po/indicator-keyboard.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-18 18:00-0400\n" +"POT-Creation-Date: 2013-08-07 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,14 +17,14 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../lib/main.c:2297 ../lib/main.vala:532 +#: ../lib/main.c:2314 ../lib/main.vala:550 msgid "Character Map" msgstr "" -#: ../lib/main.c:2299 ../lib/main.vala:533 +#: ../lib/main.c:2316 ../lib/main.vala:551 msgid "Keyboard Layout Chart" msgstr "" -#: ../lib/main.c:2301 ../lib/main.vala:534 +#: ../lib/main.c:2318 ../lib/main.vala:552 msgid "Text Entry Settings..." msgstr "" diff --git a/tests/main.vala b/tests/main.vala index a26eca55..09d612f1 100644 --- a/tests/main.vala +++ b/tests/main.vala @@ -150,18 +150,12 @@ static void test_activate_input_source (void *data) { var action_group = DBusActionGroup.get ((!) fixture.connection, "com.canonical.indicator.keyboard", "/com/canonical/indicator/keyboard"); - var loop = new MainLoop (null, false); - var signal_name = action_group.action_state_changed["current"].connect ((action, state) => { - loop.quit (); - }); - action_group.list_actions (); action_group.activate_action ("current", new Variant.uint32 (2)); - var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + var loop = new MainLoop (null, false); + Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); loop.run (); - Source.remove (source); - action_group.disconnect (signal_name); var state = action_group.get_action_state ("current"); var current = state.get_uint32 (); -- cgit v1.2.3 From 9d2aacb967186c594cc4582310080a5ce299a022 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 7 Aug 2013 11:20:47 -0400 Subject: Re-add the missing comments --- debian/control | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/control b/debian/control index 317b23ec..95e0d25e 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,9 @@ Build-Depends: debhelper (>= 9.0.0), xvfb, 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/~indicator-applet-developers/indicator-keyboard/trunk Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-develpers/indicator-keyboard/trunk/files -- cgit v1.2.3 From 170596ad221d7ea1701d2a2215ff912bddbecdfa Mon Sep 17 00:00:00 2001 From: William Hua Date: Thu, 8 Aug 2013 14:23:13 -0400 Subject: Fix a couple more potential races. --- po/indicator-keyboard.pot | 2 +- tests/main.vala | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot index 4433c98f..88197c24 100644 --- a/po/indicator-keyboard.pot +++ b/po/indicator-keyboard.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-07 10:44-0400\n" +"POT-Creation-Date: 2013-08-08 14:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/tests/main.vala b/tests/main.vala index 09d612f1..c3997520 100644 --- a/tests/main.vala +++ b/tests/main.vala @@ -319,6 +319,10 @@ static void test_migration (void *data) { return; } + var loop = new MainLoop (null, false); + Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + loop.run (); + try { string sources; Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources sources", out sources); @@ -381,6 +385,10 @@ static void test_no_migration (void *data) { return; } + var loop = new MainLoop (null, false); + Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + loop.run (); + try { string sources; Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources sources", out sources); -- cgit v1.2.3 From 4f411bb4a5a7350ba3142c885e52383914c24a7a Mon Sep 17 00:00:00 2001 From: William Hua Date: Thu, 8 Aug 2013 14:41:27 -0400 Subject: Switch to serial test harness. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 31640e6b..79c96c15 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 foreign -Wall -Woverride -Wno-portability]) +AM_INIT_AUTOMAKE([1.11 foreign serial-tests -Wall -Woverride -Wno-portability]) AM_SILENT_RULES([yes]) LT_INIT -- cgit v1.2.3 From 5c12e10be77351e88b6c550894e4ca34c99aacf8 Mon Sep 17 00:00:00 2001 From: William Hua Date: Mon, 12 Aug 2013 09:33:27 +0800 Subject: Fix out-of-bounds error. --- lib/main.vala | 8 +++++++- po/indicator-keyboard.pot | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/main.vala b/lib/main.vala index 91466f8c..d601f6f9 100644 --- a/lib/main.vala +++ b/lib/main.vala @@ -220,8 +220,14 @@ public class Indicator.Keyboard.Service : Object { private void update_indicator_action () { var visible = indicator_settings.get_boolean ("visible"); var current = source_settings.get_uint ("current"); - var icon = get_sources ()[current].icon; + var sources = get_sources (); + Variant state; + Icon? icon = null; + + if (current < sources.length) { + icon = sources[current].icon; + } if (icon != null) { state = new Variant.parsed ("{ 'visible' : <%b>, 'icon' : %v }", visible, ((!) icon).serialize ()); diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot index db38e8ef..b5d5cfca 100644 --- a/po/indicator-keyboard.pot +++ b/po/indicator-keyboard.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 14:52-0400\n" +"POT-Creation-Date: 2013-08-12 09:33+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,14 +17,14 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../lib/main.c:1405 ../lib/main.vala:322 +#: ../lib/main.c:1419 ../lib/main.vala:328 msgid "Character Map" msgstr "" -#: ../lib/main.c:1407 ../lib/main.vala:323 +#: ../lib/main.c:1421 ../lib/main.vala:329 msgid "Keyboard Layout Chart" msgstr "" -#: ../lib/main.c:1409 ../lib/main.vala:324 +#: ../lib/main.c:1423 ../lib/main.vala:330 msgid "Text Entry Settings..." msgstr "" -- cgit v1.2.3 From e89fa16b80932a31f509ce946b9e870a51cd2d01 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 13 Aug 2013 10:07:35 -0400 Subject: Remove dh_auto_test override. --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index a69660c0..d2bfba7b 100755 --- a/debian/rules +++ b/debian/rules @@ -17,5 +17,3 @@ override_dh_install: find debian/indicator-keyboard/usr/lib -name *.a -delete dh_install --fail-missing -override_dh_auto_test: - dh_auto_test || ( cat tests/test-suite.log ) -- cgit v1.2.3 From fb33dc6602f35783e76684e743ff7f166f961122 Mon Sep 17 00:00:00 2001 From: William Hua Date: Tue, 20 Aug 2013 21:16:16 +0800 Subject: Change XDG_RUNTIME_DIR to point in-tree. --- tests/indicator-keyboard-test.in | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/indicator-keyboard-test.in b/tests/indicator-keyboard-test.in index 7ae24423..1a78a2fc 100644 --- a/tests/indicator-keyboard-test.in +++ b/tests/indicator-keyboard-test.in @@ -3,5 +3,6 @@ export PATH="@abs_top_builddir@/tests/execute:$PATH" export DCONF_PROFILE="@abs_top_builddir@/tests/profiles/indicator-keyboard-test" export GSETTINGS_SCHEMA_DIR="@abs_top_builddir@/data" +export XDG_RUNTIME_DIR="@abs_top_builddir@/tests" xvfb-run -a ./indicator-keyboard-tests -- cgit v1.2.3 From 100ba6845fca6709ffcc80614e2dcc821615834f Mon Sep 17 00:00:00 2001 From: William Hua Date: Wed, 21 Aug 2013 12:46:54 +0800 Subject: Use long delays in places when they may be killed prematurely. --- po/indicator-keyboard.pot | 2 +- tests/main.vala | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot index b5d5cfca..b657f08e 100644 --- a/po/indicator-keyboard.pot +++ b/po/indicator-keyboard.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-12 09:33+0800\n" +"POT-Creation-Date: 2013-08-21 12:15+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/tests/main.vala b/tests/main.vala index 6bbcc61a..1a7833a2 100644 --- a/tests/main.vala +++ b/tests/main.vala @@ -18,6 +18,7 @@ const int TIMEOUT_S = 1; const int TIMEOUT_MS = 1000; +const int LONG_TIMEOUT_S = 10; [DBus (name = "com.canonical.indicator.keyboard.test")] public class Service : Object { @@ -193,7 +194,7 @@ static void test_activate_character_map (void *data) { action_group.activate_action ("map", null); - var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; }); loop.run (); Source.remove (source); ((!) fixture.service).disconnect (signal_name); @@ -232,7 +233,7 @@ static void test_activate_keyboard_layout_chart (void *data) { action_group.activate_action ("chart", null); - var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; }); loop.run (); Source.remove (source); ((!) fixture.service).disconnect (signal_name); @@ -260,7 +261,7 @@ static void test_activate_text_entry_settings (void *data) { action_group.activate_action ("settings", null); - var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; }); loop.run (); Source.remove (source); ((!) fixture.service).disconnect (signal_name); @@ -294,7 +295,7 @@ static void test_migration (void *data) { try { var cancellable = new Cancellable (); - var source = Timeout.add_seconds (TIMEOUT_S, () => { cancellable.cancel (); return false; }); + var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return false; }); var dbus_proxy = new DBusProxy.sync ((!) fixture.connection, DBusProxyFlags.NONE, @@ -360,7 +361,7 @@ static void test_no_migration (void *data) { try { var cancellable = new Cancellable (); - var source = Timeout.add_seconds (TIMEOUT_S, () => { cancellable.cancel (); return false; }); + var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return false; }); var dbus_proxy = new DBusProxy.sync ((!) fixture.connection, DBusProxyFlags.NONE, @@ -431,7 +432,7 @@ static void test_update_visible (void *data) { action_group.list_actions (); - var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; }); loop.run (); Source.remove (source); action_group.disconnect (signal_name); @@ -455,7 +456,7 @@ static void test_update_visible (void *data) { return; } - source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; }); loop.run (); Source.remove (source); action_group.disconnect (signal_name); @@ -479,7 +480,7 @@ static void test_update_visible (void *data) { return; } - source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; }); loop.run (); Source.remove (source); action_group.disconnect (signal_name); @@ -564,7 +565,7 @@ static void test_update_input_source (void *data) { return; } - source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; }); loop.run (); Source.remove (source); action_group.disconnect (signal_name); @@ -671,7 +672,7 @@ static void test_update_input_sources (void *data) { return; } - source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; }); + source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; }); loop.run (); Source.remove (source); section.disconnect (signal_name); -- cgit v1.2.3 From 06194a665783ed7d56a6ba32e6193aa9fb037184 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Aug 2013 07:41:31 -0400 Subject: Automatic snapshot from revision 102 (bootstrap) --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 77209792..fe15b62d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ indicator-keyboard (0.0.0-0ubuntu1) UNRELEASED; urgency=low * Initial Release. [ Mathieu Trudel-Lapierre ] + * Automatic snapshot from revision 102 (bootstrap) * debian/control: - Packaging review, add comment to developers. - Fix Vcs-Bzr, Vcs-Browser. -- cgit v1.2.3 From 95387da201ce2605d63865724145c54bac0b9fb4 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Wed, 21 Aug 2013 14:07:27 +0000 Subject: Releasing 0.0.0+13.10.20130821-0ubuntu1, based on r103 --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe15b62d..53c78547 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-keyboard (0.0.0-0ubuntu1) UNRELEASED; urgency=low +indicator-keyboard (0.0.0+13.10.20130821-0ubuntu1) saucy; urgency=low [ Jeremy Bicha ] * debian/control: @@ -23,4 +23,7 @@ indicator-keyboard (0.0.0-0ubuntu1) UNRELEASED; urgency=low * debian/compat: bump to compat level 9. * debian/source/format: make sure we're using format 1.0. - -- Mathieu Trudel-Lapierre Mon, 05 Aug 2013 13:37:16 -0400 + [ Ubuntu daily release ] + * Automatic snapshot from revision 103 + + -- Ubuntu daily release Wed, 21 Aug 2013 14:07:27 +0000 -- cgit v1.2.3 From 30ca305b4d47476ef508fc461fd469df5655f5b0 Mon Sep 17 00:00:00 2001 From: William Hua Date: Thu, 22 Aug 2013 16:45:53 +0800 Subject: Kill running gvfs instance after tests finish. --- tests/indicator-keyboard-test.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/indicator-keyboard-test.in b/tests/indicator-keyboard-test.in index 1a78a2fc..621133dd 100644 --- a/tests/indicator-keyboard-test.in +++ b/tests/indicator-keyboard-test.in @@ -5,4 +5,9 @@ export DCONF_PROFILE="@abs_top_builddir@/tests/profiles/indicator-keyboard-test" export GSETTINGS_SCHEMA_DIR="@abs_top_builddir@/data" export XDG_RUNTIME_DIR="@abs_top_builddir@/tests" -xvfb-run -a ./indicator-keyboard-tests +if xvfb-run -a ./indicator-keyboard-tests +then + pkill -f tests/gvfs || exit 0 +else + pkill -f tests/gvfs && exit 1 +fi -- cgit v1.2.3