Merge ~hmollercl/software-properties:ubuntu/master into software-properties:ubuntu/master

Proposed by Hans P. Möller
Status: Merged
Merged at revision: e95843b97b2457cb38829b97d85a95ab96db8dba
Proposed branch: ~hmollercl/software-properties:ubuntu/master
Merge into: software-properties:ubuntu/master
Diff against target: 79 lines (+30/-9)
4 files modified
data/software-properties-drivers-lxqt.desktop.in (+5/-7)
data/software-properties-lxqt.desktop.in (+14/-0)
data/software-properties-qt.desktop.in (+2/-2)
debian/changelog (+9/-0)
Reviewer Review Type Date Requested Status
Simon Quigley Pending
Review via email: mp+365822@code.launchpad.net

Commit message

Solves bug 1823306 removing lxqt-sudo from exec line in software-properties-qt.desktop
Make invisible software-properties-qt.desktop
Create software-properties-lxqt.desktop with lxqt-sudo and shown only in LXQt
Rename software-properties-drivers-qt.desktop to software-properties-drivers-lxqt.desktop to maintain consistency since it use lxqt-sudo

Description of the change

Solves bug 1823306 removing lxqt-sudo from exec line in software-properties-qt.desktop
Make invisible software-properties-qt.desktop
Create software-properties-lxqt.desktop with lxqt-sudo and shown only in LXQt
Rename software-properties-drivers-qt.desktop to software-properties-drivers-lxqt.desktop to maintain consistency since it use lxqt-sudo

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/data/software-properties-drivers-qt.desktop.in b/data/software-properties-drivers-lxqt.desktop.in
2similarity index 66%
3rename from data/software-properties-drivers-qt.desktop.in
4rename to data/software-properties-drivers-lxqt.desktop.in
5index 65e5445..ba050a8 100644
6--- a/data/software-properties-drivers-qt.desktop.in
7+++ b/data/software-properties-drivers-lxqt.desktop.in
8@@ -1,13 +1,11 @@
9 [Desktop Entry]
10-Keywords=Drivers;
11+_Name=Additional Drivers
12+_GenericName=Additional Drivers
13+_Comment=Configure third-party and proprietary drivers
14 Exec=lxqt-sudo /usr/bin/software-properties-qt --open-tab=4
15 Icon=jockey
16+OnlyShowIn=LXQt;
17 Terminal=false
18 Type=Application
19-OnlyShowIn=LXQt;
20 Categories=Settings;HardwareSettings;System;
21-X-AppStream-Ignore=true
22-Name=Additional Drivers
23-Name[es]=Controladores adicionales
24-Comment=Configure third-party and proprietary drivers
25-Comment[es]=Configure controladores privativos y de terceros
26+Keywords=Drivers;
27diff --git a/data/software-properties-lxqt.desktop.in b/data/software-properties-lxqt.desktop.in
28new file mode 100644
29index 0000000..51dbc68
30--- /dev/null
31+++ b/data/software-properties-lxqt.desktop.in
32@@ -0,0 +1,14 @@
33+[Desktop Entry]
34+_Name=Software Sources
35+_GenericName=Software Sources
36+_Comment=Configure the sources for installable software and updates
37+Exec=lxqt-sudo software-properties-qt
38+Icon=applications-other
39+OnlyShowIn=LXQt;
40+Terminal=false
41+X-MultipleArgs=false
42+Type=Application
43+Categories=System;Settings;
44+MimeType=text/x-apt-sources-list;
45+X-KDE-SubstituteUID=true
46+X-Ubuntu-Gettext-Domain=software-properties
47diff --git a/data/software-properties-qt.desktop.in b/data/software-properties-qt.desktop.in
48index 51dbc68..ea6ed87 100644
49--- a/data/software-properties-qt.desktop.in
50+++ b/data/software-properties-qt.desktop.in
51@@ -2,9 +2,9 @@
52 _Name=Software Sources
53 _GenericName=Software Sources
54 _Comment=Configure the sources for installable software and updates
55-Exec=lxqt-sudo software-properties-qt
56+Exec=software-properties-qt
57 Icon=applications-other
58-OnlyShowIn=LXQt;
59+NoDisplay=true
60 Terminal=false
61 X-MultipleArgs=false
62 Type=Application
63diff --git a/debian/changelog b/debian/changelog
64index 5822371..57bcc7a 100644
65--- a/debian/changelog
66+++ b/debian/changelog
67@@ -1,3 +1,12 @@
68+software-properties (0.97.10) disco; urgency=medium
69+
70+ * Fix bug 1823306 removing lxqt-sudo from exec line in software-properties-qt.desktop
71+ * Make invisible software-properties-qt.desktop
72+ * Create software-properties-lxqt.desktop with lxqt-sudo and shown only in LXQt
73+ * Rename software-properties-drivers-qt.desktop to software-properties-drivers-lxqt.desktop
74+
75+ -- Hans P Möller <hmoller@lubuntu.me> Wed, 10 Apr 2019 16:38:53 -0400
76+
77 software-properties (0.97.9) disco; urgency=medium
78
79 [ Andrea Azzarone ]

Subscribers

People subscribed via source and target branches