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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit e1b2b49d244a78f5adbcf55913cf433a83bf62d7
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Apr 24 16:33:19 2015 +0200

    Rename to plasmazilla, new repo for extras CI
---
 data/projects.json    | 11 ++++++-----
 data/upstream-scm.yml |  4 ++--
 dci/imager.rb         |  2 +-
 dci/mozilla.rb        |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/data/projects.json b/data/projects.json
index a5481e6..debcd34 100644
--- a/data/projects.json
+++ b/data/projects.json
@@ -46,18 +46,19 @@
           "repos" : [ "base-files",
             "plymouth-theme-netrunner-logo",
             "netrunner-desktop",
-            "expanding-icons-taskmanager",
-            "samba-mounter",
             "calamares-branding",
-            "ksuperkey",
-            "plasma-volume-control",
             "syslinux-theme-netrunner"
           ]
         },
         {
           "type" : "github",
-          "org"  : "moz-plasma",
+          "org"  : "plasmazilla",
           "repos" : ["mozilla-kde-support"]
+        },
+        {
+          "type" : "github",
+          "org"  : "debian-packaging",
+          "repos" : ["all"]
         }
     ]
 }
diff --git a/data/upstream-scm.yml b/data/upstream-scm.yml
index cea7204..8a9cdc2 100644
--- a/data/upstream-scm.yml
+++ b/data/upstream-scm.yml
@@ -60,11 +60,11 @@ git.debian.org:/git/pkg-kde/kde-std/sddm:
 
 ## Some Netrunner things
 
-https://github.com/netrunner-debian/ksuperkey:
+https://github.com/*/ksuperkey:
   kubuntu_unstable:
     url: https://github.com/hanschen/ksuperkey.git
 
-https://github.com/netrunner-debian/samba-mounter:
+https://github.com/*/samba-mounter:
   kubuntu_unstable:
     url: git://anongit.kde.org/scratch/afiestas/samba-mounter.git
     branch: frameworks
diff --git a/dci/imager.rb b/dci/imager.rb
index 7e539ea..ab6fd87 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -107,7 +107,7 @@ Dir.chdir('build') do
 
   case FLAVOR
   when /.*netrunner.*desktop/
-    repos = %w(qt5 frameworks plasma netrunner calamares moz-plasma extras)
+    repos = %w(qt5 frameworks plasma netrunner calamares plasmazilla extras)
     # 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)
diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 6894e6d..0fc8119 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -108,11 +108,11 @@ Description: #{PACKAGE} package for integration with KDE
 
   File.open("debian/#{PACKAGE}-plasma.pref", 'w') do |f|
     f.puts("Package: *
-Pin: release o=LP-PPA-moz-plasma-builds
+Pin: release o=LP-PPA-plasmazilla-builds
 Pin-Priority: 1000
 
 Package: *
-Pin: release o=LP-PPA-moz-plasma-releases
+Pin: release o=LP-PPA-plasmazilla-releases
 Pin-Priority: 1000
 ")
   end

-- 
ci-tooling packaging