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

[Łukasz Zemczak]

There has been an ABI break in libmirclient, we need to change the extra packages to install libmirclient2 now instead.

As above.

[Sebastien Bacher (seb128)]

that makes sense

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'stacks/head/mirslave.cfg'
--- stacks/head/mirslave.cfg	2013-08-20 05:46:22 +0000
+++ stacks/head/mirslave.cfg	2013-08-21 16:12:10 +0000
@@ -9,7 +9,7 @@
     - mir
   test_parameters:
     apmachines: autopilot-intel qa-nvidia-gtx660
-    packages: libboost-program-options1.53.0 libboost-system1.53.0 libgflags2 libgoogle-glog0 libunwind8 libegl1-mesa libegl1-mesa-drivers libgbm1 libgl1-mesa-dri libgl1-mesa-glx libglapi-mesa libgles2-mesa xserver-common xserver-xorg-core xserver-xorg-xmir xserver-xorg-video-ati xserver-xorg-video-radeon xserver-xorg-video-intel xserver-xorg-video-nouveau unity-system-compositor libmirprotobuf0 libmirplatform libmirserver1 libmirclient1
+    packages: libboost-program-options1.53.0 libboost-system1.53.0 libgflags2 libgoogle-glog0 libunwind8 libegl1-mesa libegl1-mesa-drivers libgbm1 libgl1-mesa-dri libgl1-mesa-glx libglapi-mesa libgles2-mesa xserver-common xserver-xorg-core xserver-xorg-xmir xserver-xorg-video-ati xserver-xorg-video-radeon xserver-xorg-video-intel xserver-xorg-video-nouveau unity-system-compositor libmirprotobuf0 libmirplatform libmirserver1 libmirclient2
     testpackages: unity-autopilot unity-system-compositor-autopilot
     tests: unity.tests.launcher.test_capture.LauncherCaptureTests.test_launcher_capture_while_not_sticky_and_hidden unity.tests.launcher.test_capture.LauncherCaptureTests.test_launcher_captures_while_sticky_and_revealed unity.tests.launcher.test_capture.LauncherCaptureTests.test_launcher_not_capture_while_not_sticky_and_hidden_moving_right unity.tests.launcher.test_capture.LauncherCaptureTests.test_launcher_not_capture_while_not_sticky_and_revealed unity.tests.launcher.test_icon_behavior.LauncherIconsTests.test_bfb_tooltip_disappear_when_dash_is_opened unity.tests.launcher.test_icon_behavior.LauncherIconsTests.test_unminimize_minimized_immediately_after_show_windows unity.tests.launcher.test_icon_behavior.LauncherIconsTests.test_right_click_on_icon_ends_expo unity.tests.launcher.test_icon_behavior.LauncherIconsTests.test_expo_launcher_icon_initiates_expo unity.tests.launcher.test_keynav.LauncherKeyNavTests.test_alt_f1_closes_dash unity.tests.launcher.test_keynav.LauncherKeyNavTests.test_alt_f1_closes_hud unity.tests.launcher.test_keynav.LauncherKeyNavTests.test_launcher_keynav_cancel_on_click_outside unity.tests.launcher.test_keynav.LauncherKeyNavTests.test_launcher_keynav_cancel_on_quicklist_activate unity.tests.launcher.test_reveal.LauncherRevealTests.test_reveal_on_mouse_to_edge unity.tests.launcher.test_scroll.LauncherScrollTests.test_autoscrolling_from_bottom unity.tests.launcher.test_scroll.LauncherScrollTests.test_autoscrolling_from_top unity.tests.launcher.test_switcher.LauncherSwitcherTests.test_launcher_switcher_cycling_forward unity.tests.launcher.test_tooltips.LauncherTooltipTests.test_launcher_bfb_tooltip_when_open unity.tests.launcher.test_visual.LauncherVisualTests.test_opening_dash_desaturates_icons unity.tests.test_command_lens.CommandScopeSearchTests.test_ctrl_tab_switching unity.tests.test_dash.DashBorderTests.test_click_bottom_border unity.tests.test_dash.DashClipboardTests.test_middle_click_paste unity.tests.test_dash.DashCrossMonitorsTests.test_dash_close_on_cross_monitor_click unity.tests.test_dash.DashKeyNavTests.test_control_tab_scope_cycle unity.tests.test_dash.DashMultiKeyTests.test_multi_key_delete unity.tests.test_dash.DashRevealTests.test_dash_reveal unity.tests.test_dash.DashRevealWithSpreadTests.test_command_scope_opens_when_in_spread unity.tests.test_hud.HudBehaviorTests.test_alt_arrow_keys_not_eaten unity.tests.test_hud.HudCrossMonitorsTests.test_hud_close_on_cross_monitor_click unity.tests.test_hud.HudLockedLauncherInteractionsTests.test_hud_desaturates_launcher_icons unity.tests.test_panel.PanelCrossMonitorsTests.test_panel_title_updates_moving_window unity.tests.test_panel.PanelMenuTests.test_menus_are_added_on_new_application unity.tests.test_panel.PanelTitleTests.test_panel_title_on_empty_desktop unity.tests.test_panel.PanelWindowButtonsTests.test_hud_maximize_button_does_not_change_dash_form_factor unity.tests.test_quicklist.QuicklistActionTests.test_quicklist_application_item_focus_last_active_window unity.tests.test_showdesktop.ShowDesktopTests.test_showdesktop_hides_apps unity.tests.test_switcher.SwitcherDetailsModeTests.test_detail_mode_selects_last_active_window unity.tests.test_switcher.SwitcherTests.test_lazy_switcher_initiate unity.tests.xim.test_gcin.GcinTestHangul.test_dash_input unity_system_compositor
   ci_default: