Merge ~wxl/kubuntu-packaging/+git/bluedevil:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/bluedevil:kubuntu_unstable

Proposed by Walter Lapchynski
Status: Needs review
Proposed branch: ~wxl/kubuntu-packaging/+git/bluedevil:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/bluedevil:kubuntu_unstable
Diff against target: 81 lines (+51/-0)
4 files modified
debian/changelog (+5/-0)
debian/patches/add-to-system-category.patch (+21/-0)
debian/patches/only-show-in-lxqt.patch (+23/-0)
debian/patches/series (+2/-0)
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+355446@code.launchpad.net

Commit message

 * Show wizard and sendfile in LXQt menus.
 * Add wizard and sendfile to System category.

Description of the change

Although it's got some KDE-specific features (that lovely Plasmoid), bluedevil seems to be the right solution for LXQt Lubuntu's needs when it comes to Bluetooth management. Unfortunately, given the fact that the Plasmoid *is* specific to KDE, we don't have a system tray icon. Therefore, we need to show the wizard and sendfile in the menus. To accomplish this, NoDisplay was swapped for OnlyShowIn, so it still won't show in KDE.

Also added it to the System category as that seems to make a lot more sense to me than Network. I can see how the latter applies, but I don't think most folks think of it that way.

To post a comment you must log in.
09d06f9... by Walter Lapchynski

unempty diff

Unmerged commits

09d06f9... by Walter Lapchynski

unempty diff

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 9f36ac3..4d7dc6d 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,7 +1,12 @@
6 bluedevil (4:5.13.90-0ubuntu1) UNRELEASED; urgency=medium
7
8+ [ Rik Mills ]
9 * New upstream release (5.13.90)
10
11+ [ Walter Lapchynski ]
12+ * Show wizard and sendfile in LXQt menus.
13+ * Add wizard and sendfile to System category.
14+
15 -- Rik Mills <rikmills@kubuntu.org> Thu, 13 Sep 2018 19:32:23 +0100
16
17 bluedevil (4:5.13.5-0ubuntu1) cosmic; urgency=medium
18diff --git a/debian/patches/add-to-system-category.patch b/debian/patches/add-to-system-category.patch
19new file mode 100644
20index 0000000..60c05cf
21--- /dev/null
22+++ b/debian/patches/add-to-system-category.patch
23@@ -0,0 +1,21 @@
24+Description: Add sendfile and wizard to System category.
25+Author: Walter Lapchynski <wxl@ubuntu.com>
26+--- a/src/sendfile/org.kde.bluedevilsendfile.desktop
27++++ b/src/sendfile/org.kde.bluedevilsendfile.desktop
28+@@ -134,5 +134,5 @@ Exec=bluedevil-sendfile
29+ Icon=preferences-system-bluetooth
30+ Terminal=false
31+ OnlyShowIn=LXQt;
32+-Categories=Qt;KDE;X-Bluetooth;Network;
33++Categories=Qt;KDE;X-Bluetooth;Network;System;
34+ X-DBUS-ServiceName=org.kde.bluedevilsendfile
35+--- a/src/wizard/org.kde.bluedevilwizard.desktop
36++++ b/src/wizard/org.kde.bluedevilwizard.desktop
37+@@ -137,6 +137,6 @@ Exec=bluedevil-wizard %U
38+ Icon=preferences-system-bluetooth
39+ Terminal=false
40+ OnlyShowIn=LXQt;
41+-Categories=Qt;KDE;X-Bluetooth;Network;
42++Categories=Qt;KDE;X-Bluetooth;Network;System;
43+ X-DBUS-StartupType=Unique
44+ X-DBUS-ServiceName=org.kde.bluedevilwizard
45diff --git a/debian/patches/only-show-in-lxqt.patch b/debian/patches/only-show-in-lxqt.patch
46new file mode 100644
47index 0000000..c2964a2
48--- /dev/null
49+++ b/debian/patches/only-show-in-lxqt.patch
50@@ -0,0 +1,23 @@
51+Description: Show wizard and sendfie in LXQt menus.
52+Author: Walter Lapchynski <wxl@ubuntu.com>
53+--- a/src/sendfile/org.kde.bluedevilsendfile.desktop
54++++ b/src/sendfile/org.kde.bluedevilsendfile.desktop
55+@@ -133,6 +133,6 @@ Type=Application
56+ Exec=bluedevil-sendfile
57+ Icon=preferences-system-bluetooth
58+ Terminal=false
59+-NoDisplay=true
60++OnlyShowIn=LXQt;
61+ Categories=Qt;KDE;X-Bluetooth;Network;
62+ X-DBUS-ServiceName=org.kde.bluedevilsendfile
63+--- a/src/wizard/org.kde.bluedevilwizard.desktop
64++++ b/src/wizard/org.kde.bluedevilwizard.desktop
65+@@ -136,7 +136,7 @@ Type=Application
66+ Exec=bluedevil-wizard %U
67+ Icon=preferences-system-bluetooth
68+ Terminal=false
69+-NoDisplay=true
70++OnlyShowIn=LXQt;
71+ Categories=Qt;KDE;X-Bluetooth;Network;
72+ X-DBUS-StartupType=Unique
73+ X-DBUS-ServiceName=org.kde.bluedevilwizard
74diff --git a/debian/patches/series b/debian/patches/series
75new file mode 100644
76index 0000000..536b900
77--- /dev/null
78+++ b/debian/patches/series
79@@ -0,0 +1,2 @@
80+only-show-in-lxqt.patch
81+add-to-system-category.patch

Subscribers

People subscribed via source and target branches