diff options
| -rw-r--r-- | .bzrignore | 3 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/Makefile.am | 9 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | po/indicator-keyboard.pot | 2 | ||||
| -rw-r--r-- | tests/indicator-keyboard-service.in | 5 | ||||
| -rwxr-xr-x | tests/indicator-keyboard-test | 12 | ||||
| -rw-r--r-- | tests/indicator-keyboard-test.in | 7 | ||||
| -rw-r--r-- | tests/services/indicator-keyboard.service.in | 2 |
9 files changed, 25 insertions, 27 deletions
@@ -19,6 +19,7 @@ configure data/com.canonical.indicator.keyboard data/indicator-keyboard-icon-generator data/indicator-keyboard.service +data/gschemas.compiled debian/autoreconf.after debian/autoreconf.before debian/files @@ -29,7 +30,7 @@ libtool po/POTFILES po/stamp-it tests/config.vala -tests/indicator-keyboard-service +tests/indicator-keyboard-test tests/indicator-keyboard-test.trs tests/indicator-keyboard-tests tests/services/indicator-keyboard.service diff --git a/configure.ac b/configure.ac index 406348b2..6cc1beb6 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,7 @@ AC_CONFIG_FILES([Makefile tests/Makefile tests/config.vala tests/services/indicator-keyboard.service]) -AC_CONFIG_FILES([tests/indicator-keyboard-service], - [chmod +x tests/indicator-keyboard-service]) +AC_CONFIG_FILES([tests/indicator-keyboard-test], + [chmod +x tests/indicator-keyboard-test]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index 885f5a60..a7f8d39c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -30,8 +30,8 @@ indicator_keyboard_icon_generator_LDFLAGS = $(AM_LDFLAGS) \ $(GNOME_DESKTOP_LIBS) \ $(LIBXKLAVIER_LIBS) -servicedir = $(DBUS_SERVICE_DIR) dist_service_DATA = indicator-keyboard.service +servicedir = $(DBUS_SERVICE_DIR) indicator-keyboard.service: $(AM_V_GEN) (echo '[D-BUS Service]'; \ @@ -39,8 +39,8 @@ indicator-keyboard.service: echo 'Exec=${libexecdir}/indicator-keyboard-service --use-gtk --use-bamf') > $@.tmp && \ mv $@.tmp $@ -indicatordir = $(INDICATOR_DIR) dist_indicator_DATA = com.canonical.indicator.keyboard +indicatordir = $(INDICATOR_DIR) com.canonical.indicator.keyboard: $(AM_V_GEN) (echo '[Indicator Service]'; \ @@ -55,6 +55,11 @@ gsettings_SCHEMAS = com.canonical.indicator.keyboard.gschema.xml @GSETTINGS_RULES@ +check_DATA = gschemas.compiled + +gschemas.compiled: $(gsettings_SCHEMAS) + $(GLIB_COMPILE_SCHEMAS) --strict . + EXTRA_DIST = $(dist_service_DATA) \ $(dist_indicator_DATA) \ $(gsettings_SCHEMAS) diff --git a/debian/control b/debian/control index a3a5c1b9..90eb2451 100644 --- a/debian/control +++ b/debian/control @@ -3,19 +3,21 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: William Hua <william.hua@canonical.com> -Build-Depends: debhelper (>= 9.0.0), +Build-Depends: quilt, + debhelper (>= 9.0.0), dh-autoreconf, dh-translations, libgirepository1.0-dev, valac, - dbus-test-runner, libgee-dev, libgtk-3-dev, libgnome-desktop-3-dev, libgnomekbd-dev, libibus-1.0-dev (>= 1.5.0), libbamf3-dev, - quilt + dbus, + 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 diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot index de95f228..a96fdd39 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-17 16:04-0400\n" +"POT-Creation-Date: 2013-07-18 18:00-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/tests/indicator-keyboard-service.in b/tests/indicator-keyboard-service.in deleted file mode 100644 index 52a31988..00000000 --- a/tests/indicator-keyboard-service.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -PATH="@abs_top_builddir@/tests/execute:$PATH" -DCONF_PROFILE="@abs_top_builddir@/tests/profiles/indicator-keyboard-test" -@abs_top_builddir@/lib/indicator-keyboard-service "$@" diff --git a/tests/indicator-keyboard-test b/tests/indicator-keyboard-test deleted file mode 100755 index 7f9e50ea..00000000 --- a/tests/indicator-keyboard-test +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if test "x$DISPLAY" = "x" -then - Xvfb -ac -noreset -screen 0 800x600x16 -help 2>/dev/null 1>&2 - XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; exit 1` - { Xvfb -ac -noreset -screen 0 800x600x16 :$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } - DISPLAY=:$XID - export DISPLAY -fi - -./indicator-keyboard-tests diff --git a/tests/indicator-keyboard-test.in b/tests/indicator-keyboard-test.in new file mode 100644 index 00000000..7ae24423 --- /dev/null +++ b/tests/indicator-keyboard-test.in @@ -0,0 +1,7 @@ +#!/bin/sh + +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" + +xvfb-run -a ./indicator-keyboard-tests diff --git a/tests/services/indicator-keyboard.service.in b/tests/services/indicator-keyboard.service.in index 8b04a464..be38867d 100644 --- a/tests/services/indicator-keyboard.service.in +++ b/tests/services/indicator-keyboard.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=com.canonical.indicator.keyboard -Exec=@abs_top_builddir@/tests/indicator-keyboard-service +Exec=@abs_top_builddir@/lib/indicator-keyboard-service |