[SCM] kscreenlocker packaging branch, master, updated. debian/5.7.4-1-50-gac9136b

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 7 12:47:35 UTC 2016


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

The following commit has been merged in the master branch:
commit 393dca6fa265da94b54a46cbdeaafd46a622e7af
Merge: 29070bb1ad10307c8f12bfe5d2083821fb946464 927f2bf8bf72aa29379823ed19d8338edc584d82
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Oct 5 17:53:56 2016 +0200

    Merge remote-tracking branch 'neon/Neon/stable'

 debian/changelog                | 88 +++++++++++++++++++++++++++++++++++++++++
 debian/control                  | 24 +++++------
 debian/copyright                |  1 +
 debian/upstream/signing-key.asc | 55 ++++++++++++++++++++++++++
 debian/watch                    |  4 +-
 5 files changed, 159 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index fe31d43,ebb07d9..3935dd4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,77 -1,88 +1,165 @@@
 +kscreenlocker (5.8.0-1~1.gbp92768a) UNRELEASED; urgency=medium
 +
 +  ** SNAPSHOT build @92768a6d0042d6a8b23a200e7a32b2d102b89ea1 **
 +
 +  * UNRELEASED
 +  * UNRELEASED
 +
 + -- Maximiliano Curia <jenkins at gnuservers.com.ar>  Tue, 04 Oct 2016 13:38:52 +0200
 +
+ kscreenlocker (5.8.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Fri, 30 Sep 2016 11:29:12 +0000
+ 
+ kscreenlocker (5.7.5-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Tue, 13 Sep 2016 13:45:25 +0000
+ 
 +kscreenlocker (5.7.4-1) unstable; urgency=medium
 +
 +  * New upstream release (5.7.4)
 +  * Bump group breaks (5.7)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Aug 2016 14:48:58 +0200
 +
+ kscreenlocker (5.7.4-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Tue, 23 Aug 2016 17:28:01 +0000
+ 
+ kscreenlocker (5.7.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Tue, 19 Jul 2016 13:46:34 +0000
+ 
+ kscreenlocker (5.7.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Tue, 12 Jul 2016 16:06:04 +0000
+ 
 +kscreenlocker (5.7.0-1) unstable; urgency=medium
 +
 +  [ Automatic packaging ]
 +  * Update build-deps and deps with the info from cmake
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 09 Jul 2016 22:21:55 +0200
 +
+ kscreenlocker (5.7.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Mon, 04 Jul 2016 13:15:31 +0000
+ 
 +kscreenlocker (5.6.5-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 24 Jun 2016 09:29:48 +0200
 +
+ kscreenlocker (5.6.5-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Tue, 14 Jun 2016 14:15:05 +0000
+ 
 +kscreenlocker (5.6.4-2) unstable; urgency=medium
 +
 +  * Add even more missing epochs.
 +    Thanks to Andreas Beckmann for reporting (Closes: 814152)
 +  * Drop a=summary from vcs browser field.
 +    Thanks to Andreas Beckmann for reporting
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 28 May 2016 21:59:02 +0200
 +
 +kscreenlocker (5.6.4-1) unstable; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * Missing epoch in plasma-workspace breaks/replaces. (Closes: #814152)
 +  * New upstream release (5.5.5).
 +  * Add a .gitattributes file to use dpkg-mergechangelogs
 +  * debian/control: Update Vcs-Browser and Vcs-Git fields
 +  * Fix break/replaces against the l10n packages
 +  * Add upstream metadata (DEP-12)
 +  * Update install files.
 +
 +  [ Automatic packaging ]
 +  * Update build-deps and deps with the info from cmake
 +  * Bump Standards-Version to 3.9.8
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 28 May 2016 01:54:48 +0200
 +
+ kscreenlocker (5.6.4-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 11 May 2016 09:41:33 +0000
+ 
+ kscreenlocker (5.6.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Tue, 19 Apr 2016 16:56:32 +0000
+ 
+ kscreenlocker (5.6.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Fri, 08 Apr 2016 11:43:30 +0000
+ 
 +kscreenlocker (5.5.4-1) experimental; urgency=medium
 +
 +  [Rohan Garg]
 +  * Initial release
 +
 +  [Scarlett Clark]
 +  * Add missing dependency for plasma-framework-dev
 +  * Few more missing dependencies.
 +  * Add some descriptions.
 +  * Add XtestSuite.
 +  * Add test files.
 +  * Clean up tests. Disable tests at buildtime.
 +  * Adjust install file.
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.5.0)
 +  * New upstream release (5.5.1).
 +  * New upstream release (5.5.2).
 +  * New upstream release (5.5.3).
 +  * New upstream release (5.5.4).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 16:49:06 +0100
+ kscreenlocker (5.5.4-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   [Rohan Garg]
+   * Initial release
+ 
+   [Scarlett Clark]
+   * Add missing dependency for plasma-framework-dev
+   * Few more missing dependencies.
+   * Add some descriptions.
+   * Add XtestSuite.
+   * Add test files.
+   * Clean up tests. Disable tests at buildtime.
+   * Adjust install file.
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (5.5.0)
+   * New upstream release (5.5.1).
+   * New upstream release (5.5.2).
+ 
+   [ Philip Muškovac ]
+   * libkscreenlocker5 breaks/replaces plasma-workspace << 4:5.5~ 
+   * kde-config-screenlocker breaks/replaces plasma-workspace << 4:5.5~ 
+ 
+   [ Clive Johnston ]
+   * New upstream release
+   * New upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:11:13 +0000
diff --cc debian/control
index 98de0e1,5f23657..0c0cb50
--- a/debian/control
+++ b/debian/control
@@@ -5,21 -5,15 +5,21 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12~),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 1.8.0~),
-                kwayland-dev,
-                libkf5crash-dev (>= 5.15.0~),
-                libkf5declarative-dev (>= 5.15.0~),
-                libkf5globalaccel-dev (>= 5.15.0~),
-                libkf5i18n-dev (>= 5.15.0~),
-                libkf5idletime-dev (>= 5.15.0~),
-                libkf5kcmutils-dev (>= 5.15.0~),
-                libkf5kdelibs4support-dev (>= 5.15.0~),
-                libkf5kwayland-dev,
+                extra-cmake-modules (>= 5.18.0~),
 -               kwayland-dev (>= 4:5.5.1~),
+                libkf5crash-dev (>= 5.18.0~),
+                libkf5declarative-dev (>= 5.18.0~),
+                libkf5globalaccel-dev (>= 5.18.0~),
+                libkf5i18n-dev (>= 5.18.0~),
+                libkf5idletime-dev (>= 5.18.0~),
+                libkf5kcmutils-dev (>= 5.18.0~),
+                libkf5kdelibs4support-dev (>= 5.18.0~),
++               libkf5kwayland-dev (>= 4:5.5.1~),
 +               libkf5notifications-dev (>= 5.15.0~),
++               libkf5plasma-dev (>= 5.18.0~),
 +               libkf5solid-dev (>= 5.15.0~),
 +               libkf5textwidgets-dev (>= 5.15.0~),
 +               libkf5windowsystem-dev (>= 5.15.0~),
 +               libkf5xmlgui-dev (>= 5.15.0~),
                 libpam0g-dev,
                 libqt5x11extras5-dev (>= 5.4.0~),
                 libwayland-dev (>= 1.3~),
@@@ -28,15 -22,16 +28,15 @@@
                 libxcb-xtest0-dev,
                 libxcb1-dev,
                 libxcursor-dev,
+                libxi-dev,
                 pkg-config,
                 pkg-kde-tools,
-                plasma-framework-dev (>= 5.15.0~),
 -               plasma-framework-dev (>= 5.18.0~),
                 qtbase5-dev (>= 5.4.0~),
                 qtdeclarative5-dev (>= 5.4.0~)
 -Standards-Version: 3.9.6
 +Standards-Version: 3.9.8
  Homepage: https://projects.kde.org/kscreenlocker
 -Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kscreenlocker.git
 -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-kde/plasma/kscreenlocker.git;a=summary
 +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/plasma/kscreenlocker.git
 +Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/plasma/kscreenlocker.git
  
  Package: kscreenlocker-dev
  Section: libdevel
@@@ -65,7 -58,17 +65,9 @@@ Architecture: an
  Depends: libkscreenlocker5 (= ${binary:Version}),
           ${misc:Depends},
           ${shlibs:Depends}
 -Breaks: plasma-workspace (<< 4:5.5~)
 -Replaces: plasma-workspace (<< 4:5.5~)
 +Breaks: plasma-workspace (<= 4:5.5.0~), ${kde-l10n:all}
 +Replaces: plasma-workspace (<= 4:5.5.0~), ${kde-l10n:all}
 +Description: KCM Module for kscreenlocker
 + KDE systemsettings module to configure kscreenlocker
+ Description: KCM Module for kscreenlocker
+  KDE systemsettings module to configure kscreenlocker
 -
 -Package: kscreenlocker-dbg
 -Architecture: any
 -Section: debug
 -Priority: extra
 -Depends: libkscreenlocker5 (= ${binary:Version}), ${misc:Depends}
 -Description: Debug files for kscreenlocker.
 - Library and components for secure lock screen architecture.
 - .
 - This package contains debug files for kscreenlocker.

-- 
kscreenlocker packaging



More information about the pkg-kde-commits mailing list