From ed316fe56169b346aa718949a526e0d66331787e Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 4 Sep 2018 16:39:51 -0500 Subject: [PATCH] Remove the reverse-applicable fix-defaultde-variable.patch. --- debian/changelog | 1 + debian/patches/fix-defaultde-variable.patch | 13 ------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 debian/patches/fix-defaultde-variable.patch diff --git a/debian/changelog b/debian/changelog index d577798..db47f68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ calamares (3.2.2-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. + * Remove the reverse-applicable fix-defaultde-variable.patch. -- Simon Quigley Tue, 04 Sep 2018 16:38:57 -0500 diff --git a/debian/patches/fix-defaultde-variable.patch b/debian/patches/fix-defaultde-variable.patch deleted file mode 100644 index 5656265..0000000 --- a/debian/patches/fix-defaultde-variable.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: Fix default desktop environment variable in displaymanager. -Author: Walter Lapchynski ---- a/src/modules/displaymanager/main.py -+++ b/src/modules/displaymanager/main.py -@@ -398,7 +398,7 @@ def run(): - username = libcalamares.globalstorage.value("autologinUser") - root_mount_point = libcalamares.globalstorage.value("rootMountPoint") - -- if "default_desktop_environment" in libcalamares.job.configuration: -+ if "defaultDesktopEnvironment" in libcalamares.job.configuration: - entry = libcalamares.job.configuration["defaultDesktopEnvironment"] - default_desktop_environment = DesktopEnvironment( - entry["executable"], entry["desktopFile"] diff --git a/debian/patches/series b/debian/patches/series index b146923..bb52cef 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -fix-defaultde-variable.patch 0001-replace-pkexec-by-sudo.patch 0002-Add-patch-to-compile-with-pythonQt.patch 0003-remove-wrong-path.patch