[SCM] ktimer packaging branch, master, updated. debian/4.12.2-2-4-gb0f8276

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/ktimer.git;a=commitdiff;h=b0f8276

The following commit has been merged in the master branch:
commit b0f8276aab6b4f0d8c14c2a7f98dc8a45f872d3a
Merge: 74b9e7b982548eae941764bfd5beb10b980c9013 c5beebbe91cdeba46d573aea4aaa4d151ada1cb6
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 29 16:01:13 2014 +0200

    Merge branch 'master' of git://git.debian.org/pkg-kde/kde-sc/ktimer
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/control | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --cc debian/control
index e1eb89e,308b0b9..5b1c967
--- a/debian/control
+++ b/debian/control
@@@ -8,10 -8,12 +8,12 @@@ Uploaders: Fathi Boudra <fabo at debian.or
             George Kiagiadakis <kiagiadakis.george at gmail.com>,
             Eshat Cakar <info at eshat.de>,
             Maximiliano Curia <maxy at debian.org>
- Build-Depends: kde-sc-dev-latest (>= 4:4.12),
-  cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12),
-  kdelibs5-dev (>= 4:4.11)
- Standards-Version: 3.9.4
+ Build-Depends: cmake,
+                debhelper (>= 9),
 -               kde-sc-dev-latest (>= 4:4.11),
++               kde-sc-dev-latest (>= 4:4.12),
+                kdelibs5-dev (>= 4:4.11),
+                pkg-kde-tools (>= 0.12)
+ Standards-Version: 3.9.5
  Homepage: http://www.kde.org/
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/ktimer.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/ktimer.git

-- 
ktimer packaging