Merge branch 'debian-master-tmp_2016-11-12_185437' into kubuntu_zesty_archive

8 files changed, 246 insertions, 38 deletions

diff --git a/debian/changelog b/debian/changelog
index e508e3b..63ab2e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,34 @@ kscreenlocker (5.8.3-0ubuntu1) UNRELEASED; urgency=medium
 
  -- José Manuel Santamaría Lema <panfaust@gmail.com>  Sat, 29 Oct 2016 16:48:37 +0200
 
+kscreenlocker (5.8.2-1) unstable; urgency=medium
+
+  * New upstream release (5.8.2)
+
+ -- Maximiliano Curia <maxy@debian.org>  Wed, 19 Oct 2016 15:21:16 +0200
+
+kscreenlocker (5.8.1-1) unstable; urgency=medium
+
+  * New upstream release (5.8.1)
+
+ -- Maximiliano Curia <maxy@debian.org>  Sun, 16 Oct 2016 22:58:06 +0200
+
+kscreenlocker (5.8.0-1) unstable; urgency=medium
+
+  [ Maximiliano Curia ]
+  * New upstream release (5.8.0)
+  * Update build-deps and deps with the info from cmake
+  * Replace dbus-launch with dbus-run-session in tests
+  * Bump group breaks (5.8)
+
+ -- Maximiliano Curia <maxy@debian.org>  Fri, 07 Oct 2016 14:03:50 +0200
+
+kscreenlocker (5.8.0-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Fri, 30 Sep 2016 11:29:12 +0000
+
 kscreenlocker (5.7.5-0ubuntu1) yakkety; urgency=medium
 
   * New upstream release (5.7.4)
@@ -16,6 +44,25 @@ kscreenlocker (5.7.5-0ubuntu1) yakkety; urgency=medium
 
  -- Rik Mills <rik.mills88@gmail.com>  Tue, 20 Sep 2016 20:27:03 -0500
 
+kscreenlocker (5.7.5-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@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@debian.org>  Fri, 26 Aug 2016 14:48:58 +0200
+
+kscreenlocker (5.7.4-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Tue, 23 Aug 2016 17:28:01 +0000
+
 kscreenlocker (5.7.2-0ubuntu1) yakkety; urgency=medium
 
   * New upstream release (5.7.1)
@@ -23,6 +70,37 @@ kscreenlocker (5.7.2-0ubuntu1) yakkety; urgency=medium
 
  -- Clive Johnston <clivejo@kubuntu.org>  Thu, 28 Jul 2016 12:05:35 +0000
 
+kscreenlocker (5.7.2-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Tue, 19 Jul 2016 13:46:34 +0000
+
+kscreenlocker (5.7.1-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@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@debian.org>  Sat, 09 Jul 2016 22:21:55 +0200
+
+kscreenlocker (5.7.0-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Mon, 04 Jul 2016 13:15:31 +0000
+
+kscreenlocker (5.6.5-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy@debian.org>  Fri, 24 Jun 2016 09:29:48 +0200
+
 kscreenlocker (5.6.5-0ubuntu1) yakkety; urgency=medium
 
   [ Clive Johnston ]
@@ -33,6 +111,38 @@ kscreenlocker (5.6.5-0ubuntu1) yakkety; urgency=medium
 
  -- Clive Johnston <clivejo@kubuntu.org>  Fri, 15 Jul 2016 20:45:34 +0100
 
+kscreenlocker (5.6.5-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@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@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@debian.org>  Sat, 28 May 2016 01:54:48 +0200
+
 kscreenlocker (5.6.4-0ubuntu1) yakkety; urgency=medium
 
   [ Clive Johnston ]
@@ -48,12 +158,52 @@ kscreenlocker (5.6.4-0ubuntu1) yakkety; urgency=medium
 
  -- Clive Johnston <clivejo@kubuntu.org>  Wed, 18 May 2016 13:18:57 -0700
 
+kscreenlocker (5.6.4-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Wed, 11 May 2016 09:41:33 +0000
+
+kscreenlocker (5.6.3-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Tue, 19 Apr 2016 16:56:32 +0000
+
+kscreenlocker (5.6.2-0neon) xenial; urgency=medium
+
+  * New release
+
+ -- Neon CI <neon@kde.org>  Fri, 08 Apr 2016 11:43:30 +0000
+
 kscreenlocker (5.5.5-0ubuntu1) xenial; urgency=medium
 
   * New upstream bugfix release
 
  -- Philip Muškovac <yofel@kubuntu.org>  Thu, 14 Apr 2016 13:41:53 -0700
 
+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@debian.org>  Wed, 27 Jan 2016 16:49:06 +0100
 kscreenlocker (5.5.4-0ubuntu1) xenial; urgency=medium
 
   [Rohan Garg]
diff --git a/debian/control b/debian/control
index 812f268..d34b04c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,21 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Maximiliano Curia <maxy@debian.org>
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.24.0~),
-               kwayland-dev (>= 4:5.24.0~),
-               libkf5crash-dev (>= 5.24.0~),
-               libkf5declarative-dev (>= 5.24.0~),
-               libkf5globalaccel-dev (>= 5.24.0~),
-               libkf5i18n-dev (>= 5.24.0~),
-               libkf5idletime-dev (>= 5.24.0~),
-               libkf5kcmutils-dev (>= 5.24.0~),
-               libkf5kdelibs4support-dev (>= 5.24.0~),
+               extra-cmake-modules (>= 5.27.0~),
+               libkf5crash-dev (>= 5.27.0~),
+               libkf5declarative-dev (>= 5.27.0~),
+               libkf5globalaccel-dev (>= 5.27.0~),
+               libkf5i18n-dev (>= 5.27.0~),
+               libkf5idletime-dev (>= 5.27.0~),
+               libkf5kcmutils-dev (>= 5.27.0~),
+               libkf5kdelibs4support-dev (>= 5.27.0~),
+               libkf5notifications-dev (>= 5.27.0~),
+               libkf5plasma-dev (>= 5.27.0~),
+               libkf5solid-dev (>= 5.27.0~),
+               libkf5textwidgets-dev (>= 5.27.0~),
+               libkf5wayland-dev (>= 4:5.5.1~),
+               libkf5windowsystem-dev (>= 5.27.0~),
+               libkf5xmlgui-dev (>= 5.27.0~),
                libpam0g-dev,
                libqt5x11extras5-dev (>= 5.6.1~),
                libwayland-dev (>= 1.3~),
@@ -25,19 +31,20 @@ Build-Depends: cmake (>= 2.8.12~),
                libxi-dev,
                pkg-config,
                pkg-kde-tools,
-               plasma-framework-dev (>= 5.24.0~),
-               qtbase5-dev (>= 5.6.1~),
-               qtdeclarative5-dev (>= 5.6.1~)
-Standards-Version: 3.9.6
+               qtbase5-dev (>= 5.4.0~),
+               qtdeclarative5-dev (>= 5.4.0~)
+Standards-Version: 3.9.8
 Homepage: https://projects.kde.org/kscreenlocker
-Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kscreenlocker
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kscreenlocker
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kscreenlocker
 
 Package: kscreenlocker-dev
-Section: libdevel
 Architecture: any
 Multi-Arch: same
+Section: libdevel
 Depends: libkscreenlocker5 (= ${binary:Version}), ${misc:Depends}
+Breaks: plasma-workspace-dev (<= 4:5.5.0~)
+Replaces: plasma-workspace-dev (<= 4:5.5.0~)
 Description: Development files for kscreenlocker
  Library and components for secure lock screen architecture.
  .
@@ -45,11 +52,11 @@ Description: Development files for kscreenlocker
 
 Package: libkscreenlocker5
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: kde-config-screenlocker
-Breaks: plasma-workspace (<< 4:5.5~)
-Replaces: plasma-workspace (<< 4:5.5~)
-Multi-Arch: same
+Breaks: kwin-common (<< 4:5.8), plasma-workspace (<< 4:5.8)
+Replaces: plasma-workspace (<= 4:5.5.0~)
 Description: Secure lock screen architecture
  Library and components for secure lock screen architecture.
 
@@ -58,17 +65,7 @@ Architecture: any
 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
-
-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.
diff --git a/debian/rules b/debian/rules
index e39781d..0542cb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+l10npkgs_firstversion_ok := 4:4.14.0-2
 
-override_dh_strip:
-	$(overridden_command) --dbg-package=kscreenlocker-dbg
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time
diff --git a/debian/tests/control b/debian/tests/control
index dcb37cd..c3ad4a5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, openbox,
+         xvfb, xauth, dbus (>= 1.8), openbox,
          kded5, libkf5service-bin
 Restrictions: rw-build-tree
 
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 00220b9..67b3bd8 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -7,4 +7,4 @@ debian/rules clean 2>&1
 dpkg-source --before-build .
 debian/rules build 2>&1
 xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
-    dbus-launch --exit-with-session debian/tests/testsuite.xsession
+    dbus-run-session -- debian/tests/testsuite.xsession
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..6d86e12
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,7 @@
+Name: kscreenlocker
+Changelog: https://quickgit.kde.org/?p=kscreenlocker.git&a=log
+Contact: plasma-devel@kde.org
+Donation: https://www.kde.org/community/donations/index.php
+Repository: https://anongit.kde.org/kscreenlocker.git
+Repository-Browse: https://quickgit.kde.org/?p=kscreenlocker.git
+Security-Contact: security@kde.org
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..8a76b20
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,55 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+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
+=xM/W
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index d899e3b..3c55bfc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
-version=3
-http://download.kde.org/unstable/plasma/([\d.]+)/kscreenlocker-([\d.]+)\.tar\.xz
-http://download.kde.org/stable/plasma/([\d.]+)/kscreenlocker-([\d.]+)\.tar\.xz
+version=4
+opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/plasma/([\d.]+)/kscreenlocker-([\d.]+)\.tar\.xz