New upstream release

calamares/branding/debian/branding.desc

@@ -4,12 +4,12 @@ welcomeStyleCalamares: true
 
 strings:
     productName:         Debian GNU/Linux
-    shortProductName:    Debian GNU/Linux
-    version:             10
+    shortProductName:    Debian
+    version:             10 (buster)
     shortVersion:        10
-    versionedName:       Debian GNU/Linux
-    shortVersionedName:  Debian GNU/Linux 10
-    bootloaderEntryName: Debian GNU/Linux
+    versionedName:       Debian GNU/Linux 10 (buster)
+    shortVersionedName:  Debian 10
+    bootloaderEntryName: Debian
     productUrl:          https://debian.org
     supportUrl:          https://www.debian.org/support
     releaseNotesUrl:     https://www.debian.org/releases/stretch/releasenotes

calamares/modules/packages.conf

@@ -11,3 +11,4 @@ operations:
       - 'live-tools'
       - 'live-task-localisation'
       - 'live-task-recommended'
+      - 'calamares-settings-debian'

calamares/modules/welcome.conf

@@ -10,7 +10,6 @@ requirements:
         - storage
         - ram
         - power
-        - internet
         - root
     required:
         - storage

calamares/settings.conf

@@ -44,7 +44,6 @@ sequence:
   - bootloader
   - packages
   - luksbootkeyfile
-  - luksopenswaphookcfg
   - plymouthcfg
   - initramfscfg
   - initramfs
@@ -68,3 +67,25 @@ sequence:
 # specified here, Calamares then takes care of finding it and
 # loading the contents.
 branding: debian
+
+# If this is set to true, Calamares will show an "Are you sure?" prompt right
+# before each execution phase, i.e. at points of no return. If this is set to
+# false, no prompt is shown. Default is false.
+#
+# YAML: boolean.
+prompt-install: false
+
+# If this is set to true, Calamares will execute all target environment
+# commands in the current environment, without chroot. This setting should
+# only be used when setting up Calamares as a post-install configuration tool,
+# as opposed to a full operating system installer.
+#
+# Some official Calamares modules are not expected to function with this
+# setting. (e.g. partitioning seems like a bad idea, since that is expected to
+# have been done already)
+#
+# Default is false (for a normal installer).
+#
+# YAML: boolean.
+dont-chroot: false
+

debian/changelog

@@ -1,3 +1,39 @@
+calamares-settings-debian (10.0.18-1) unstable; urgency=medium
+
+  * New upstream releas
+    - fix efi install path to EFI/debian
+  * Update to debhelper-compat (=12)
+
+ -- Jonathan Carter <jcc@debian.org>  Fri, 15 Feb 2019 16:06:39 +0200
+
+calamares-settings-debian (10.0.17-1) unstable; urgency=medium
+
+  * New upstream release
+    - explicitly remove calamares-settings-debian from calamares packages
+      module
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 16 Jan 2019 19:14:36 +0200
+
+calamares-settings-debian (10.0.16-1) unstable; urgency=medium
+
+  * New upstream release
+  * Fix package description (Closes: #918222)
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 16 Jan 2019 12:15:28 +0200
+
+calamares-settings-debian (10.0.15-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update standards version to 4.3.0
+
+ -- Jonathan Carter <jcc@debian.org>  Tue, 08 Jan 2019 10:48:47 +0200
+
+calamares-settings-debian (10.0.14-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 10 Dec 2018 15:32:26 +0200
+
 calamares-settings-debian (10.0.13-1) unstable; urgency=medium
 
   * New upstream release

debian/compat

@@ -1 +0,0 @@
-11

debian/control

@@ -2,8 +2,8 @@ Source: calamares-settings-debian
 Section: utils
 Priority: optional
 Maintainer: Jonathan Carter <jcc@debian.org>
-Build-Depends: debhelper (>= 11), libglib2.0-bin
-Standards-Version: 4.2.1
+Build-Depends: debhelper-compat (= 12), libglib2.0-bin
+Standards-Version: 4.3.0
 Homepage: https://salsa.debian.org/live-team/calamares-settings-debian
 Vcs-Git: https://salsa.debian.org/live-team/calamares-settings-debian-packaging.git
 Vcs-Browser: https://salsa.debian.org/live-team/calamares-settings-debian-packaging
@@ -18,7 +18,7 @@ Depends: calamares,
          ${misc:Depends}
 Provides: calamares-settings
 Description: Debian theme and settings for the Calamares Installer
- Calamares is a genereic installer framework for Linux distributions.
+ Calamares is a generic installer framework for Linux distributions.
  By default, it contains a set of boilerplate wording and images. This
  package provides the latest Debian artwork as well as scripts that
  supports EFI installations.

debian/files

@@ -1 +0,0 @@
-calamares-settings-debian_10.0.13-1_source.buildinfo utils optional

install-debian

@@ -3,6 +3,13 @@
 # Wrapper for running calamares on Debian live media
 ###
 
+# Stale file left behind by live-build that messes with partitioning
+sudo mv /etc/fstab /etc/fstab.orig.calamares
+
+# Access control to run calamares as root for xwayland
 xhost +si:localuser:root
-sudo calamares
+pkexec calamares
 xhost -si:localuser:root
+
+# Restore stale fstab, for what it's worth
+sudo mv /etc/fstab.orig.calamares /etc/fstab

install-debian.desktop

@@ -10,3 +10,4 @@ Icon=install-debian
 Terminal=false
 Categories=Qt;System;
 StartupWMClass=calamares
+StartupNotify=True