[SCM] systemsettings packaging branch, kubuntu_vivid_archive, updated. 8b7ef2a98580ed7e2b86ebf03343890986074845

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit f220bb774a835151609b10ccadf4b695fc011ff1
Merge: 25673e1643c88a71f2e65d2308ced71d771d45c9 2c792cbabf47df2cbd53860eba23b78a78c5b3a7
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Nov 7 15:30:44 2014 +0100

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

 debian/control                | 32 +-------------------------------
 debian/systemsettings.install |  2 +-
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --cc debian/control
index 43efe3c,07c3294..5c9100f
--- a/debian/control
+++ b/debian/control
@@@ -54,10 -25,9 +25,9 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: systemsettings
  Section: utils
  Architecture: any
- Depends: ${misc:Depends},
-          ${shlibs:Depends}
+ Depends: ${misc:Depends}, ${shlibs:Depends}
 -Breaks: systemsettings-data (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa3)
 -Replaces: systemsettings-data (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa3)
 +Breaks: systemsettings-data (<< 4:5.0.2+git20140920~)
 +Replaces: systemsettings-data (<< 4:5.0.2+git20140920~)
  Description: System Settings interface
   Desktop configuration application.
   .

-- 
systemsettings packaging