xubuntu-dev team mailing list archive

[Simon Steinbeiß <ochosi@xxxxxxxxxxxxxxxxxx>]

Simon Steinbeiß has proposed merging lp:~ochosi/xubuntu-default-settings/drop_jockeydesktop into lp:xubuntu-default-settings.

Requested reviews:
  Xubuntu Developers (xubuntu-dev)

For more details, see:
https://code.launchpad.net/~ochosi/xubuntu-default-settings/drop_jockeydesktop/+merge/214215

Drop the jockey.desktop file as it is provided in the software-properties package now (LP: #1060543), otherwise we end up with two launchers in our settings-manager.
-- 
https://code.launchpad.net/~ochosi/xubuntu-default-settings/drop_jockeydesktop/+merge/214215
Your team Xubuntu Developers is requested to review the proposed merge of lp:~ochosi/xubuntu-default-settings/drop_jockeydesktop into lp:xubuntu-default-settings.

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-24 19:46:36 +0000
+++ debian/changelog	2014-04-04 11:25:01 +0000
@@ -1,3 +1,9 @@
+xubuntu-default-settings (14.04.2ubuntu1) UNRELEASED; urgency=medium
+
+  * Remove jockey.desktop as it is provided in software-properties now (LP: #1060543)
+
+ -- Simon Steinbeiß <ochosi@melanzane>  Fri, 04 Apr 2014 13:22:42 +0200
+
 xubuntu-default-settings (14.04.2) trusty; urgency=low
 
   [ Simon Steinbeiß ]

=== removed file 'usr/share/xubuntu/applications/jockey.desktop.in'
--- usr/share/xubuntu/applications/jockey.desktop.in	2013-07-17 04:35:04 +0000
+++ usr/share/xubuntu/applications/jockey.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Keywords=Drivers;
-Exec=/usr/bin/software-properties-gtk --open-tab=4
-Icon=jockey
-Terminal=false
-Type=Application
-OnlyShowIn=XFCE;
-Categories=X-XFCE;GTK;Settings;HardwareSettings
-_Name=Additional Drivers
-_Comment=Configure third-party and proprietary drivers