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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 1a7ee745db9d43dffdb2f6e616b09089f8477d96
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jan 7 11:01:10 2016 +0100

    fork sourcer2 like binarier2 because of hardcoded repo data
---
 kci/{sourcer.rb => sourcer2.rb} | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/kci/sourcer.rb b/kci/sourcer2.rb
old mode 100755
new mode 100644
similarity index 88%
copy from kci/sourcer.rb
copy to kci/sourcer2.rb
index 3928434..6969c1e
--- a/kci/sourcer.rb
+++ b/kci/sourcer2.rb
@@ -133,23 +133,15 @@ end
 
 # dpkg-buildpackage
 Dir.chdir('build/source/') do
-  # FIXME: harcoded vivid
-  debline = "deb http://46.101.170.116 #{LSB::DISTRIB_CODENAME} main"
+  debline = "deb http://archive.neon.kde.org.uk/unstable #{LSB::DISTRIB_CODENAME} main"
   Apt::Repository.add(debline)
-  Net::HTTP.start('46.101.170.116') do |http|
-    response = http.get('/Pangea CI.gpg.key')
-    File.open('/tmp/key', 'w') do |file|
-      file.write(response.body)
-    end
-  end
-  Apt::Key.add('/tmp/key')
-  Apt::Repository.add('ppa:plasma-phone/ppa')
-  if DPKG::BUILD_ARCH == 'armhf'
-    debline2 = "deb http://ports.ubuntu.com/ubuntu-ports #{LSB::DISTRIB_CODENAME}-backports main restricted universe multiverse"
-  else
-    debline2 = "deb http://archive.ubuntu.com/ubuntu #{LSB::DISTRIB_CODENAME}-backports main restricted universe multiverse"
+  # FIXME: this needs to be in the module!
+  IO.popen(['apt-key', 'add', '-'], 'w') do |io|
+    io.puts open('http://archive.neon.kde.org.uk/public.key').read
+    io.close_write
+    puts io
   end
-  Apt::Repository.add(debline2)
+  abort 'Failed to import key' unless $? == 0
   Apt.update
 
   # Install some minimal build dependencies to make sure we can get past the

-- 
ci-tooling packaging