Merge lp:~sil2100/cupstream2distro-config/temporary_unity_new_ibus into lp:cupstream2distro-config

[Łukasz Zemczak]

Temporarily add libibus-1.0-5 to the list of packages in the unity stack

Temporarily add libibus-1.0-5 to the list of packages in the unity stack

[Sebastien Bacher (seb128)]

that looks fine

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'stacks/head/unity.cfg'
--- stacks/head/unity.cfg	2013-07-18 11:06:29 +0000
+++ stacks/head/unity.cfg	2013-07-29 08:34:27 +0000
@@ -31,7 +31,9 @@
     local_archive_pocket: saucy
   test_parameters:
     apmachines: ati intel
-    packages: python-wadllib python-simplejson python-secretstorage python-paramiko python-oauth python-lazr.uri python-lazr.restfulclient python-launchpadlib python-keyring libjs-jquery unity-scopes-runner libnux-4.0-0 libdecoration0 libunity-misc4 libdee-1.0-4 compiz unity-lens-photos compiz-gnome unity-lens-video unity-lens-files compiz-core unity nux-tools unity-scope-musicstores gir1.2-dee-1.0 libnux-4.0-common libunity-scopes-json-def-desktop gir1.2-unity-5.0 unity-lens-friends unity-lens-applications unity-lens-music unity-services libunity-core-6.0-7 unity-asset-pool libunity-protocol-private0 libunity9 unity-scope-video-remote unity-scope-gdrive compiz-plugins-default libcompizconfig0 unity-scope-audacious unity-scope-chromiumbookmarks unity-scope-calculator unity-scope-clementine unity-scope-colourlovers unity-scope-devhelp unity-scope-deviantart unity-scope-firefoxbookmarks unity-scope-gallica unity-scope-github unity-scope-gmusicbrowser unity-scope-googlenews unity-scope-gourmet unity-scope-guayadeque unity-scope-home unity-scope-launchpad unity-scope-manpages unity-scope-musique unity-scope-openclipart unity-scope-openweathermap unity-scope-soundcloud unity-scope-sshsearch unity-scope-texdoc unity-scope-tomboy unity-scope-virtualbox unity-scope-yahoostock unity-scope-yelp unity-scope-zotero unity-scopes-master-default
+    # XXX: the libibus-1.0-5 package is temporary until ibus 1.5.3 gets out of proposed
+    #  into the default image
+    packages: libibus-1.0-5 python-wadllib python-simplejson python-secretstorage python-paramiko python-oauth python-lazr.uri python-lazr.restfulclient python-launchpadlib python-keyring libjs-jquery unity-scopes-runner libnux-4.0-0 libdecoration0 libunity-misc4 libdee-1.0-4 compiz unity-lens-photos compiz-gnome unity-lens-video unity-lens-files compiz-core unity nux-tools unity-scope-musicstores gir1.2-dee-1.0 libnux-4.0-common libunity-scopes-json-def-desktop gir1.2-unity-5.0 unity-lens-friends unity-lens-applications unity-lens-music unity-services libunity-core-6.0-7 unity-asset-pool libunity-protocol-private0 libunity9 unity-scope-video-remote unity-scope-gdrive compiz-plugins-default libcompizconfig0 unity-scope-audacious unity-scope-chromiumbookmarks unity-scope-calculator unity-scope-clementine unity-scope-colourlovers unity-scope-devhelp unity-scope-deviantart unity-scope-firefoxbookmarks unity-scope-gallica unity-scope-github unity-scope-gmusicbrowser unity-scope-googlenews unity-scope-gourmet unity-scope-guayadeque unity-scope-home unity-scope-launchpad unity-scope-manpages unity-scope-musique unity-scope-openclipart unity-scope-openweathermap unity-scope-soundcloud unity-scope-sshsearch unity-scope-texdoc unity-scope-tomboy unity-scope-virtualbox unity-scope-yahoostock unity-scope-yelp unity-scope-zotero unity-scopes-master-default
     testpackages: python-autopilot autopilot-desktop recordmydesktop unity-autopilot
     tests: unity
   dependencies: