[SCM] kdeconnect-plasma packaging branch, kubuntu_vivid_archive, updated. 37c9001528f5ea52a6b7a3f69ad51b42c1cb1465

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect-plasma.git;a=commitdiff;h=37c9001

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 37c9001528f5ea52a6b7a3f69ad51b42c1cb1465
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Mar 6 11:16:42 2015 +0100

    sync with archive
---
 debian/changelog                                                   | 2 +-
 debian/control                                                     | 6 +-----
 debian/copyright                                                   | 4 ++--
 debian/{kdeconnect-plasma5.install => kdeconnect-plasma.install}   | 0
 debian/kdeconnect-plasma.lintian-overrides                         | 3 +++
 debian/{kdeconnect-plasma5.manpages => kdeconnect-plasma.manpages} | 0
 debian/rules                                                       | 2 +-
 debian/source/local-options                                        | 1 -
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63479d7..24c013d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 kdeconnect-plasma (0.0+git20150302-0ubuntu1) vivid; urgency=medium
 
   * Sync with Debian
-  * Update package for kdeconnect-plasma
+  * Update package for kdeconnect-plasma LP: #1427349
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 02 Mar 2015 19:23:55 +0100
 
diff --git a/debian/control b/debian/control
index 2df3f78..6eb54c7 100644
--- a/debian/control
+++ b/debian/control
@@ -27,11 +27,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kdeconnect-plasma.git
 
 Package: kdeconnect-plasma
 Architecture: any
-Depends: libqca-qt5-2-plugins,
-         plasma-workspace,
-         sshfs,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libqca-qt5-2-plugins, plasma-workspace, sshfs, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: kdeconnect
 Replaces: kdeconnect
 Description: connect smartphones to your KDE Plasma desktop
diff --git a/debian/copyright b/debian/copyright
index 4b483b7..ee4ef08 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -83,7 +83,7 @@ License: GPL-KDEeV
 
 Files: interfaces/KDEConnectConfig.cmake.in
 Copyright: 2014, Alexandr Akulich <akulichalexander at gmail.com>
-License: BSD
+License: BSD-3-clause
 
 Files: cmake/FindXTest.cmake
 Copyright: 2011, O.S. Systems Software Ltda.
@@ -166,7 +166,7 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in "/usr/share/common-licenses/LGPL-2.1".
 
-License: BSD
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
diff --git a/debian/kdeconnect-plasma5.install b/debian/kdeconnect-plasma.install
similarity index 100%
rename from debian/kdeconnect-plasma5.install
rename to debian/kdeconnect-plasma.install
diff --git a/debian/kdeconnect-plasma.lintian-overrides b/debian/kdeconnect-plasma.lintian-overrides
new file mode 100644
index 0000000..be7166b
--- /dev/null
+++ b/debian/kdeconnect-plasma.lintian-overrides
@@ -0,0 +1,3 @@
+desktop-command-not-in-package usr/share/applications/kdeconnect.desktop kcmshell5
+desktop-command-not-in-package usr/share/applications/kdeconnect-non-plasma.desktop plasmawindowed
+package-name-doesnt-match-sonames libkdeconnectcore0 libkdeconnectinterfaces0
diff --git a/debian/kdeconnect-plasma5.manpages b/debian/kdeconnect-plasma.manpages
similarity index 100%
rename from debian/kdeconnect-plasma5.manpages
rename to debian/kdeconnect-plasma.manpages
diff --git a/debian/rules b/debian/rules
index 07041b9..0d89596 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=kdeconnect-plasma5-dbg
+	$(overridden_command) --dbg-package=kdeconnect-plasma-dbg
 
 #dbus tests don't like to run
 override_dh_auto_test:
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

-- 
kdeconnect-plasma packaging