mirror of
https://git.launchpad.net/~ubuntu-qt-code/ubuntu/+source/calamares/+git/calamares
synced 2025-04-12 11:41:15 +00:00
Remove the reverse-applicable fix-defaultde-variable.patch.
This commit is contained in:
parent
6433c9d4b9
commit
ed316fe561
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -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 <tsimonq2@ubuntu.com> Tue, 04 Sep 2018 16:38:57 -0500
|
||||
|
||||
|
13
debian/patches/fix-defaultde-variable.patch
vendored
13
debian/patches/fix-defaultde-variable.patch
vendored
@ -1,13 +0,0 @@
|
||||
Description: Fix default desktop environment variable in displaymanager.
|
||||
Author: Walter Lapchynski <wxl@ubuntu.com>
|
||||
--- 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"]
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user