[SCM] milou packaging branch, kubuntu_stable, updated. 2987818fa42137c7e6583b60a5b8220337870a21

Harald Sitter apachelogger-guest at moszumanska.debian.org
Thu Mar 26 22:31:07 UTC 2015


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

The following commit has been merged in the kubuntu_stable branch:
commit 2987818fa42137c7e6583b60a5b8220337870a21
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 23:31:05 2015 +0100

    drop upstream_scm metadata, now in ci-tooling
---
 debian/control                | 4 ++--
 debian/copyright              | 4 ++--
 debian/meta/upstream_scm.json | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 432ce4a..bf5b789 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,10 @@ Build-Depends: cmake,
                libkf5declarative-dev (>= 5.2.0),
                libkf5i18n-dev (>= 5.2.0),
                libkf5runner-dev (>= 5.2.0),
+               pkg-kde-tools,
                plasma-framework-dev (>= 5.2.0),
                qtdeclarative5-dev,
-               qtscript5-dev,
-               pkg-kde-tools
+               qtscript5-dev
 Standards-Version: 3.9.5
 Section: kde
 Homepage: https://projects.kde.org/projects/kde/workspace/milou
diff --git a/debian/copyright b/debian/copyright
index f1ca9dc..5d4d0e8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,8 +46,8 @@ License: GPL-3 or LGPL-2.1
  ensure the GNU General Public License version 3.0 requirements will be
  met: http://www.gnu.org/copyleft/gpl.html
 
-Files: lib/previews/videos/*         
-       plasmoid/* 
+Files: lib/previews/videos/*
+       plasmoid/*
        debian/*
 Copyright: 2013-2014 Vishesh Handa <me at vhanda.in>
            2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
diff --git a/debian/meta/upstream_scm.json b/debian/meta/upstream_scm.json
deleted file mode 100644
index e86bffb..0000000
--- a/debian/meta/upstream_scm.json
+++ /dev/null
@@ -1 +0,0 @@
-{"branch":"Plasma/5.2"}
\ No newline at end of file

-- 
milou packaging



More information about the pkg-kde-commits mailing list