Software Properties

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

  1. Git
  2. lp:~hmollercl/software-properties
  3. ubuntu/master
  4. Merge into 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
diff --git a/data/software-properties-drivers-qt.desktop.in b/data/software-properties-drivers-lxqt.desktop.in
0similarity index 66%0similarity index 66%
1rename from data/software-properties-drivers-qt.desktop.in1rename from data/software-properties-drivers-qt.desktop.in
2rename to data/software-properties-drivers-lxqt.desktop.in2rename to data/software-properties-drivers-lxqt.desktop.in
index 65e5445..ba050a8 100644
--- a/data/software-properties-drivers-qt.desktop.in
+++ b/data/software-properties-drivers-lxqt.desktop.in
@@ -1,13 +1,11 @@
1[Desktop Entry]1[Desktop Entry]
2Keywords=Drivers;2_Name=Additional Drivers
3_GenericName=Additional Drivers
4_Comment=Configure third-party and proprietary drivers
3Exec=lxqt-sudo /usr/bin/software-properties-qt --open-tab=45Exec=lxqt-sudo /usr/bin/software-properties-qt --open-tab=4
4Icon=jockey6Icon=jockey
7OnlyShowIn=LXQt;
5Terminal=false8Terminal=false
6Type=Application9Type=Application
7OnlyShowIn=LXQt;
8Categories=Settings;HardwareSettings;System;10Categories=Settings;HardwareSettings;System;
9X-AppStream-Ignore=true11Keywords=Drivers;
10Name=Additional Drivers
11Name[es]=Controladores adicionales
12Comment=Configure third-party and proprietary drivers
13Comment[es]=Configure controladores privativos y de terceros
diff --git a/data/software-properties-lxqt.desktop.in b/data/software-properties-lxqt.desktop.in
14new file mode 10064412new file mode 100644
index 0000000..51dbc68
--- /dev/null
+++ b/data/software-properties-lxqt.desktop.in
@@ -0,0 +1,14 @@
1[Desktop Entry]
2_Name=Software Sources
3_GenericName=Software Sources
4_Comment=Configure the sources for installable software and updates
5Exec=lxqt-sudo software-properties-qt
6Icon=applications-other
7OnlyShowIn=LXQt;
8Terminal=false
9X-MultipleArgs=false
10Type=Application
11Categories=System;Settings;
12MimeType=text/x-apt-sources-list;
13X-KDE-SubstituteUID=true
14X-Ubuntu-Gettext-Domain=software-properties
diff --git a/data/software-properties-qt.desktop.in b/data/software-properties-qt.desktop.in
index 51dbc68..ea6ed87 100644
--- a/data/software-properties-qt.desktop.in
+++ b/data/software-properties-qt.desktop.in
@@ -2,9 +2,9 @@
2_Name=Software Sources2_Name=Software Sources
3_GenericName=Software Sources3_GenericName=Software Sources
4_Comment=Configure the sources for installable software and updates4_Comment=Configure the sources for installable software and updates
5Exec=lxqt-sudo software-properties-qt5Exec=software-properties-qt
6Icon=applications-other6Icon=applications-other
7OnlyShowIn=LXQt;7NoDisplay=true
8Terminal=false8Terminal=false
9X-MultipleArgs=false9X-MultipleArgs=false
10Type=Application10Type=Application
diff --git a/debian/changelog b/debian/changelog
index 5822371..57bcc7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1software-properties (0.97.10) disco; urgency=medium
2
3 * Fix bug 1823306 removing lxqt-sudo from exec line in software-properties-qt.desktop
4 * Make invisible software-properties-qt.desktop
5 * Create software-properties-lxqt.desktop with lxqt-sudo and shown only in LXQt
6 * Rename software-properties-drivers-qt.desktop to software-properties-drivers-lxqt.desktop
7
8 -- Hans P Möller <hmoller@lubuntu.me> Wed, 10 Apr 2019 16:38:53 -0400
9
1software-properties (0.97.9) disco; urgency=medium10software-properties (0.97.9) disco; urgency=medium
211
3 [ Andrea Azzarone ]12 [ Andrea Azzarone ]

Subscribers

People subscribed via source and target branches