[SCM] powerdevil packaging branch, master, updated. 2f71a80807e28913c535fd8dce2ea9e95a8c1c58

Maximiliano Curia maxy at moszumanska.debian.org
Thu Mar 26 12:43:02 UTC 2015


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

The following commit has been merged in the master branch:
commit afcbc1163e0031ee04b5fd5acd043bd587612574
Merge: 49b6f1b564b9bb6a5c285a985cba9222ab3c4d23 e987a2062124469d0d23a9044b50bceb42085b8c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 11:26:51 2015 +0100

    Merge commit 'e987a2062124469d0d23a9044b50bceb42085b8c'
    
    Conflicts:
    	debian/control

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

diff --cc debian/changelog
index b0a8386,1fc885f..0732ac2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,27 @@@
 +powerdevil (4:5.2.1-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.2.1).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 21 Mar 2015 09:54:50 +0100
 +
+ powerdevil (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:50:11 -0800
+ 
 +powerdevil (4:5.2.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Add myself as Uploader.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update copyright information.
 +  * Update install files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 13 Feb 2015 14:21:48 +0100
 +
  powerdevil (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index f3dc0ae,7af3e69..f69e25d
--- a/debian/control
+++ b/debian/control
@@@ -25,15 -23,11 +25,15 @@@ Build-Depends: cmake (>= 2.8.12)
                 libxrandr-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
-                plasma-workspace-dev (>= 4:5.2.0),
 -               plasma-framework-dev (>= 5.2.0),
 -               plasma-workspace-dev (>= 4:5.2.1)
 -Standards-Version: 3.9.5
++               plasma-workspace-dev (>= 4:5.2.1),
 +               qtbase5-dev (>= 5.2.0)
 +Standards-Version: 3.9.6
 +Homepage: https://projects.kde.org/projects/kde/workspace/powerdevil
 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/powerdevil.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/powerdevil.git
  
  Package: powerdevil-dev
 +Section: devel
  Architecture: any
  Depends: libpowerdevilcore2 (= ${binary:Version}),
           libpowerdevilui5 (= ${binary:Version}),

-- 
powerdevil packaging



More information about the pkg-kde-commits mailing list