[SCM] oxygen packaging branch, kubuntu_unstable, updated. 772a07aece5f6d7c0101af8681b3f1e4723ed827

Harald Sitter apachelogger-guest at moszumanska.debian.org
Tue Mar 3 08:15:51 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit 772a07aece5f6d7c0101af8681b3f1e4723ed827
Merge: be2565f754f295ee2f3edff9a978ad7b74a7e852 38228073bf779303400744c1612a79f99855eb14
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Mar 3 09:13:29 2015 +0100

    Merge branch 'kubuntu_stable' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/control
index 4a87d32,dab2c35..dbbb23c
--- a/debian/control
+++ b/debian/control
@@@ -4,8 -4,7 +4,8 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Build-Depends: cmake,
                 debhelper (>= 9.0.0),
                 extra-cmake-modules (>= 1.3.0~),
-                kwin-dev (>= 4:5.2.0),
+                kwin-dev (>= 4:5.2.1),
 +               libkdecorations2-dev (>= 4:5.2.0),
                 libkf5auth-dev (>= 5.2.0),
                 libkf5codecs-dev (>= 5.2.0),
                 libkf5completion-dev (>= 5.2.0),

-- 
oxygen packaging



More information about the pkg-kde-commits mailing list