[SCM] ci-tooling packaging branch, master, updated. ab996769d3e339c412a0abd0307eb4d4c8e72ed0

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=ab99676

The following commit has been merged in the master branch:
commit ab996769d3e339c412a0abd0307eb4d4c8e72ed0
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Apr 22 16:04:06 2015 +0200

    Explicitly add skype-bin:i386 since live-build is a bit shit
---
 dci/imager.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 6f1a76b..cca2ca9 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -102,7 +102,9 @@ Dir.chdir('build') do
   case FLAVOR
   when /.*netrunner.*desktop/
     repos = %w(qt5 frameworks plasma netrunner calamares moz-plasma extras)
-    packages = %w(netrunner-desktop calamares calamares-branding)
+    # live build is a bit shit at handling multi arch at the moment
+    # So we need to explicitly specify that we need skype-bin:i386 on the ISO
+    packages = %w(netrunner-desktop calamares calamares-branding skype-bin:i386)
 
     extra_opts << '--debian-installer-gui false'
 

-- 
ci-tooling packaging