[SCM] kscreen packaging branch, kubuntu_unstable, updated. debian/1.0.2.1-1-12-g3d80b58

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kscreen.git;a=commitdiff;h=3d80b58

The following commit has been merged in the kubuntu_unstable branch:
commit 3d80b58ea85183bf89cabcbeb06dbd4ec97b49cb
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Nov 27 10:42:34 2014 +0100

    add meta as kscreen lives in frameworks branch still
    
    Conflicts:
    	debian/meta/upstream_scm.json
---
 debian/meta/upstream_scm.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/meta/upstream_scm.json b/debian/meta/upstream_scm.json
index e86bffb..7cb8a9e 100644
--- a/debian/meta/upstream_scm.json
+++ b/debian/meta/upstream_scm.json
@@ -1 +1,4 @@
-{"branch":"Plasma/5.2"}
\ No newline at end of file
+{
+    "type" : "git",
+    "branch" : "frameworks"
+}

-- 
kscreen packaging