Merge lp:~bfiller/ubuntu-keyboard/install-server.conf into lp:ubuntu-keyboard

[Bill Filler]

Install server.conf file to replace the default keyboard, until the config system is better handled later on.

install server.conf file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/18/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Tested, looks good. Thanks.

And as we discussed, this needs further discussion with thomas once he's back from vacation.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-08-15 21:12:42 +0000
+++ debian/control	2013-08-22 02:04:27 +0000
@@ -12,7 +12,7 @@
                libpinyin2-dev,
                libpresage-dev,
                libubuntu-platform-api1-dev,
-               maliit-framework-dev (>= 0.99+git20130702+97e8335),
+               maliit-framework-dev (>= 0.99.0+git20130615+97e8335-0ubuntu3),
                pkg-config,
                qt5-default,
                qtbase5-dev,
@@ -25,7 +25,7 @@
 
 Package: ubuntu-keyboard
 Architecture: any
-Depends: maliit-framework (>= 0.99+git20130702+97e8335),
+Depends: maliit-framework (>= 0.99.0+git20130615+97e8335-0ubuntu3),
          qtdeclarative5-window-plugin,
          ubuntu-keyboard-data (>= ${source:Version}),
          ${misc:Depends},

=== added file 'debian/server.conf'
--- debian/server.conf	1970-01-01 00:00:00 +0000
+++ debian/server.conf	2013-08-22 02:04:27 +0000
@@ -0,0 +1,20 @@
+[maliit]
+onscreen\active=libubuntu-keyboard-plugin.so:en_us
+
+pluginsettings\libubuntu-keyboard-plugin.so\current_style		= ubuntu
+pluginsettings\libubuntu-keyboard-plugin.so\word_engine_enabled		= false
+
+onscreen\enabled=libubuntu-keyboard-plugin.so:en_gb, \
+libubuntu-keyboard-plugin.so:en_us, \
+libubuntu-keyboard-plugin.so:de, \
+libubuntu-keyboard-plugin.so:es, \
+libubuntu-keyboard-plugin.so:zh_cn_cangjie, \
+libubuntu-keyboard-plugin.so:zh_cn_pinyin, \
+libubuntu-keyboard-plugin.so:zh_cn_zhuyin, 
+
+
+; pluginsettings\libubuntu-keyboard-plugin.so\auto_correct_enabled	= false
+; pluginsettings\libubuntu-keyboard-plugin.so\feedback_enabled		= false
+; pluginsettings\libubuntu-keyboard-plugin.so\auto_caps_enabled		= false
+; pluginsettings\libubuntu-keyboard-plugin.so\hide_word_ribbon_in_potrait_mode = false
+

=== modified file 'debian/ubuntu-keyboard.install'
--- debian/ubuntu-keyboard.install	2013-08-15 20:33:21 +0000
+++ debian/ubuntu-keyboard.install	2013-08-22 02:04:27 +0000
@@ -1,1 +1,2 @@
+debian/server.conf etc/xdg/maliit.org/
 usr/lib/maliit/plugins/libubuntu-keyboard-plugin.so