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

[ԜаӀtеr Ⅼарсһуnѕkі]

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

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.

09d06f9... by ԜаӀtеr Ⅼарсһуnѕkі on 2018-09-25

unempty diff

Unmerged commits

09d06f9... by ԜаӀtеr Ⅼарсһуnѕkі on 2018-09-25

unempty diff

diff --git a/debian/changelog b/debian/changelog
index 9f36ac3..4d7dc6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 bluedevil (4:5.13.90-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Rik Mills ]
   * New upstream release (5.13.90)
 
+  [ Walter Lapchynski ]
+  * Show wizard and sendfile in LXQt menus.
+  * Add wizard and sendfile to System category. 
+
  -- Rik Mills <[e-mail]>  Thu, 13 Sep 2018 19:32:23 +0100
 
 bluedevil (4:5.13.5-0ubuntu1) cosmic; urgency=medium
diff --git a/debian/patches/add-to-system-category.patch b/debian/patches/add-to-system-category.patch
new file mode 100644
index 0000000..60c05cf
--- /dev/null
+++ b/debian/patches/add-to-system-category.patch
@@ -0,0 +1,21 @@
+Description: Add sendfile and wizard to System category.
+Author: Walter Lapchynski <[e-mail]>
+--- a/src/sendfile/org.kde.bluedevilsendfile.desktop
++++ b/src/sendfile/org.kde.bluedevilsendfile.desktop
+@@ -134,5 +134,5 @@ Exec=bluedevil-sendfile
+ Icon=preferences-system-bluetooth
+ Terminal=false
+ OnlyShowIn=LXQt;
+-Categories=Qt;KDE;X-Bluetooth;Network;
++Categories=Qt;KDE;X-Bluetooth;Network;System;
+ X-DBUS-ServiceName=org.kde.bluedevilsendfile
+--- a/src/wizard/org.kde.bluedevilwizard.desktop
++++ b/src/wizard/org.kde.bluedevilwizard.desktop
+@@ -137,6 +137,6 @@ Exec=bluedevil-wizard %U
+ Icon=preferences-system-bluetooth
+ Terminal=false
+ OnlyShowIn=LXQt;
+-Categories=Qt;KDE;X-Bluetooth;Network;
++Categories=Qt;KDE;X-Bluetooth;Network;System;
+ X-DBUS-StartupType=Unique
+ X-DBUS-ServiceName=org.kde.bluedevilwizard
diff --git a/debian/patches/only-show-in-lxqt.patch b/debian/patches/only-show-in-lxqt.patch
new file mode 100644
index 0000000..c2964a2
--- /dev/null
+++ b/debian/patches/only-show-in-lxqt.patch
@@ -0,0 +1,23 @@
+Description: Show wizard and sendfie in LXQt menus.
+Author: Walter Lapchynski <[e-mail]>
+--- a/src/sendfile/org.kde.bluedevilsendfile.desktop
++++ b/src/sendfile/org.kde.bluedevilsendfile.desktop
+@@ -133,6 +133,6 @@ Type=Application
+ Exec=bluedevil-sendfile
+ Icon=preferences-system-bluetooth
+ Terminal=false
+-NoDisplay=true
++OnlyShowIn=LXQt;
+ Categories=Qt;KDE;X-Bluetooth;Network;
+ X-DBUS-ServiceName=org.kde.bluedevilsendfile
+--- a/src/wizard/org.kde.bluedevilwizard.desktop
++++ b/src/wizard/org.kde.bluedevilwizard.desktop
+@@ -136,7 +136,7 @@ Type=Application
+ Exec=bluedevil-wizard %U
+ Icon=preferences-system-bluetooth
+ Terminal=false
+-NoDisplay=true
++OnlyShowIn=LXQt;
+ Categories=Qt;KDE;X-Bluetooth;Network;
+ X-DBUS-StartupType=Unique
+ X-DBUS-ServiceName=org.kde.bluedevilwizard
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..536b900
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+only-show-in-lxqt.patch
+add-to-system-category.patch