[SCM] kdeconnect-plasma packaging branch, kubuntu_unstable, updated. d9eed5af46af7386924783971d31175d86a5e615

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Tue Jun 16 02:24:51 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit d9eed5af46af7386924783971d31175d86a5e615
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Jun 16 04:24:47 2015 +0200

    sync to trunk
---
 debian/changelog                           |  6 ++++
 debian/docs                                |  1 -
 debian/kdeconnect-plasma.install           | 53 +++++++++++++++++++++++++-----
 debian/kdeconnect-plasma.lintian-overrides |  2 +-
 debian/rules                               |  3 ++
 5 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef1e6f0..218a6b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdeconnect-plasma (0.0+git20150316-0ubuntu1) vivid; urgency=medium
+
+  * New upstream snapshot for systray icon fix
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 13 Mar 2015 21:12:31 +0100
+
 kdeconnect-plasma (0.0+git20150302-0ubuntu2) vivid; urgency=medium
 
   * change conflicts on kdeconnect for breaks/replaces << 0.7.3-0ubuntu2
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index b43bf86..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/debian/kdeconnect-plasma.install b/debian/kdeconnect-plasma.install
index acac55b..07aa750 100644
--- a/debian/kdeconnect-plasma.install
+++ b/debian/kdeconnect-plasma.install
@@ -1,18 +1,55 @@
 etc/xdg/autostart/kdeconnectd.desktop
+usr/bin/kcapp
 usr/bin/kdeconnect-cli
 usr/lib/*/libexec/kdeconnectd
-usr/lib/*/libkdeconnectcore.so.*
-usr/lib/*/libkdeconnectinterfaces.so.*
-usr/lib/*/libkdeconnectpluginkcm.so.*
-usr/lib/*/qt5/plugins/*
-usr/lib/*/qt5/plugins/kdeconnect/*
+usr/lib/*/libkdeconnectcore.so.0
+usr/lib/*/libkdeconnectcore.so.0.8.0
+usr/lib/*/libkdeconnectinterfaces.so.0
+usr/lib/*/libkdeconnectinterfaces.so.0.8.0
+usr/lib/*/qt5/plugins/kcm_kdeconnect.so
+usr/lib/*/qt5/plugins/kdeconnect_pausemusic_config.so
+usr/lib/*/qt5/plugins/kdeconnect_share_config.so
+usr/lib/*/qt5/plugins/kdeconnectfiletiemaction.so
+usr/lib/*/qt5/plugins/kio_kdeconnect.so
 usr/lib/*/qt5/qml/org/kde/kdeconnect/libkdeconnectdeclarativeplugin.so
 usr/lib/*/qt5/qml/org/kde/kdeconnect/qmldir
+usr/lib/x86_64-linux-gnu/libkdeconnectpluginkcm.so.0*
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_battery.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_clipboard.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_mousepad.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_mpriscontrol.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_notifications.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_pausemusic.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_ping.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_screensaver_inhibit.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_sftp.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_share.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/kdeconnect/kdeconnect_telephony.so
 usr/share/applications/kdeconnect-non-plasma.desktop
 usr/share/applications/kdeconnect.desktop
 usr/share/dbus-1/services/org.kde.kdeconnect.service
-usr/share/icons/hicolor/*
+usr/share/icons/hicolor/128x128/apps/kdeconnect.png
+usr/share/icons/hicolor/16x16/apps/kdeconnect.png
+usr/share/icons/hicolor/22x22/apps/kdeconnect.png
+usr/share/icons/hicolor/256x256/apps/kdeconnect.png
+usr/share/icons/hicolor/32x32/apps/kdeconnect.png
+usr/share/icons/hicolor/32x32/status/
+usr/share/icons/hicolor/48x48/apps/kdeconnect.png
+usr/share/icons/hicolor/64x64/apps/kdeconnect.png
+usr/share/icons/hicolor/scalable/apps/kdeconnect.svgz
+usr/share/icons/hicolor/scalable/status/
 usr/share/knotifications5/kdeconnect.notifyrc
-usr/share/kservices5/*
+usr/share/kservices5/kcm_kdeconnect.desktop
+usr/share/kservices5/kdeconnect.protocol
+usr/share/kservices5/kdeconnect_pausemusic_config.desktop
+usr/share/kservices5/kdeconnect_share_config.desktop
+usr/share/kservices5/kdeconnectsendfile.desktop
+usr/share/kservices5/plasma-kdeconnect.desktop
 usr/share/kservicetypes5/kdeconnect_plugin.desktop
-usr/share/plasma/plasmoids/org.kde.kdeconnect/*
+usr/share/plasma/plasmoids/org.kde.kdeconnect/contents/ui/Battery.qml
+usr/share/plasma/plasmoids/org.kde.kdeconnect/contents/ui/CompactRepresentation.qml
+usr/share/plasma/plasmoids/org.kde.kdeconnect/contents/ui/DeviceDelegate.qml
+usr/share/plasma/plasmoids/org.kde.kdeconnect/contents/ui/FullRepresentation.qml
+usr/share/plasma/plasmoids/org.kde.kdeconnect/contents/ui/Sftp.qml
+usr/share/plasma/plasmoids/org.kde.kdeconnect/contents/ui/main.qml
+usr/share/plasma/plasmoids/org.kde.kdeconnect/metadata.desktop
diff --git a/debian/kdeconnect-plasma.lintian-overrides b/debian/kdeconnect-plasma.lintian-overrides
index ba5126d..be7166b 100644
--- a/debian/kdeconnect-plasma.lintian-overrides
+++ b/debian/kdeconnect-plasma.lintian-overrides
@@ -1,3 +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 libkdeconnectpluginkcm0
+package-name-doesnt-match-sonames libkdeconnectcore0 libkdeconnectinterfaces0
diff --git a/debian/rules b/debian/rules
index 0d89596..162d5fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+override_dh_auto_configure:
+	$(overridden_command) -- -DEXPERIMENTALAPP_ENABLED=On
+
 override_dh_strip:
 	$(overridden_command) --dbg-package=kdeconnect-plasma-dbg
 

-- 
kdeconnect-plasma packaging



More information about the pkg-kde-commits mailing list