From e691acdf2580382f5321b039523944b0720a18ba Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 11 Aug 2019 22:12:22 -0400 Subject: [PATCH] Package Calamares for new upstream release. Summary: Package Calamares for new upstream release 3.2.12 Bump debian/compat to 12. Adjust desktop patch to not show in LXQt. T108 Test Plan: Test Calamares install. Verify only one desktop file appears in menu. Reviewers: wxl, tsimonq2 Reviewed By: wxl, tsimonq2 Differential Revision: https://phab.lubuntu.me/D29 --- debian/changelog | 8 ++++++++ debian/compat | 2 +- debian/patches/0001-replace-pkexec-by-sudo.patch | 12 ++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index efde3f2..a548a13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +calamares (3.2.12-0ubuntu1) eoan; urgency=medium + + * New upstream release. + * Update debian/compat to 12, no changes needed. + * Adjust desktop patch to NotShowIn=LXQt. + + -- Dan Simmons Sun, 11 Aug 2019 20:46:30 -0400 + calamares (3.2.11-0ubuntu1) eoan; urgency=medium * New upstream release. diff --git a/debian/compat b/debian/compat index b4de394..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/debian/patches/0001-replace-pkexec-by-sudo.patch b/debian/patches/0001-replace-pkexec-by-sudo.patch index ad9ca01..7d69b52 100644 --- a/debian/patches/0001-replace-pkexec-by-sudo.patch +++ b/debian/patches/0001-replace-pkexec-by-sudo.patch @@ -6,16 +6,20 @@ Subject: replace pkexec by sudo calamares.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/calamares.desktop b/calamares.desktop -index f8be5d1..53c2424 100644 --- a/calamares.desktop +++ b/calamares.desktop -@@ -5,7 +5,7 @@ Name=Install System +@@ -5,12 +5,13 @@ Name=Install System GenericName=System Installer - Keywords=calamares;system;installer + Keywords=calamares;system;installer; TryExec=calamares -Exec=pkexec /usr/bin/calamares +Exec=sudo /usr/bin/calamares Comment=Calamares — System Installer Icon=calamares Terminal=false + StartupNotify=true + Categories=Qt;System; ++NotShowIn=LXQt; + X-AppStream-Ignore=true + + Name[ar]=تثبيت النظام