New upstream release

COPYING

@@ -0,0 +1,7 @@
+ISC License
+
+Copyright (c) 2016-2018, Jonathan Carter <jcc@debian.org>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

calamares-modules/bootloader-config/module.desc

@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "bootloader-config"
+interface:  "process"
+command:    "/usr/sbin/bootloader-config"
+timeout:    600

calamares-modules/sources-final/module.desc

@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "sources-final"
+interface:  "process"
+command:    "/usr/sbin/sources-final"
+timeout:    600

calamares-modules/sources-media-unmount/module.desc

@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "sources-media-unmount"
+interface:  "process"
+command:    "/usr/sbin/sources-media -u"
+timeout:    600

calamares-modules/sources-media/module.desc

@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "sources-media"
+interface:  "process"
+command:    "/usr/sbin/sources-media"
+timeout:    600

calamares/branding/debian/branding.desc

@@ -0,0 +1,27 @@
+---
+componentName:   debian
+welcomeStyleCalamares: true
+
+strings:
+    productName:         Debian GNU/Linux
+    shortProductName:    Debian GNU/Linux
+    version:             10
+    shortVersion:        10
+    versionedName:       Debian GNU/Linux
+    shortVersionedName:  Debian GNU/Linux 10
+    bootloaderEntryName: Debian GNU/Linux
+    productUrl:          https://debian.org
+    supportUrl:          https://www.debian.org/support
+    releaseNotesUrl:     https://www.debian.org/releases/stretch/releasenotes
+
+images:
+    productLogo:         "debian-logo.png"
+    productIcon:         "debian-logo.png"
+    productWelcome:      "welcome.png"
+
+slideshow:               "show.qml"
+
+style:
+   sidebarBackground:    "#2c3133"
+   sidebarText:          "#FFFFFF"
+   sidebarTextSelect:    "#4d7079"

calamares/branding/debian/show.qml

@@ -0,0 +1,51 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2018, Jonathan Carter <jcc@debian.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, or (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0;
+import calamares.slideshow 1.0;
+
+Presentation
+{
+    id: presentation
+
+    Timer {
+        interval: 20000
+        repeat: true
+        onTriggered: presentation.goToNextSlide()
+    }
+
+    Slide {
+        Image {
+            id: background1
+            source: "slide1.png"
+            width: 467; height: 280
+            fillMode: Image.PreserveAspectFit
+            anchors.centerIn: parent
+        }
+        Text {
+            anchors.horizontalCenter: background1.horizontalCenter
+            anchors.top: background1.bottom
+            text: "Welcome to Debian GNU/Linux.<br/>"+
+                  "The rest of the installation is automated and should complete in a few minutes."
+            wrapMode: Text.WordWrap
+            width: 600
+            horizontalAlignment: Text.Center
+        }
+    }
+
+}

calamares/modules/bootloader.conf

@@ -0,0 +1,54 @@
+# Bootloader configuration. The bootloader is installed to allow
+# the system to start (and pick one of the installed operating
+# systems to run).
+---
+# Define which bootloader you want to use for EFI installations
+# Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
+efiBootLoader: "grub"
+
+# systemd-boot configuration files settings, set kernel and initramfs file names
+# and amount of time before default selection boots
+kernel: "/vmlinuz-linux"
+img: "/initramfs-linux.img"
+fallback: "/initramfs-linux-fallback.img"
+timeout: "10"
+
+# Optionally set the menu entry name and kernel name to use in systemd-boot.
+# If not specified here, these settings will be taken from branding.desc.
+#
+# bootloaderEntryName: "Generic GNU/Linux"
+# kernelLine: ", with Stable-Kernel"
+# fallbackKernelLine:  ", with Stable-Kernel (fallback initramfs)"
+
+# GRUB 2 binary names and boot directory
+# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
+# These names are also used when using sb-shim, since that needs some
+# GRUB functionality (notably grub-probe) to work. As needed, you may use
+# complete paths like `/usr/bin/efibootmgr` for the executables.
+#
+grubInstall: "grub-install"
+grubMkconfig: "grub-mkconfig"
+grubCfg: "/boot/grub/grub.cfg"
+grubProbe: "grub-probe"
+efiBootMgr: "efibootmgr"
+
+# Optionally set the bootloader ID to use for EFI. This is passed to
+# grub-install --bootloader-id.
+#
+# If not set here, the value from bootloaderEntryName from branding.desc
+# is used, with problematic characters (space and slash) replaced.
+#
+# The ID is also used as a directory name within the EFI environment,
+# and the bootloader is copied from /boot/efi/EFI/<dirname>/ . When
+# setting the option here, keep in mind that the name is sanitized
+# (problematic characters, see above, are replaced).
+#
+# efiBootloaderId: "dirname"
+
+# Optionally install a copy of the GRUB EFI bootloader as the EFI
+# fallback loader (either bootia32.efi or bootx64.efi depending on
+# the system). This may be needed on certain systems (Intel DH87MC
+# seems to be the only one). If you set this to false, take care
+# to add another module to optionally install the fallback on those
+# boards that need it.
+installEFIFallback: true

calamares/modules/finished.conf

@@ -0,0 +1,4 @@
+---
+restartNowEnabled: true
+restartNowChecked: true
+restartNowCommand: "systemctl -i reboot"

calamares/modules/fstab.conf

@@ -0,0 +1,11 @@
+---
+mountOptions:
+    default: defaults,noatime
+    btrfs: defaults,noatime,space_cache,autodefrag
+ssdExtraMountOptions:
+    ext4: discard
+    jfs: discard
+    xfs: discard
+    swap: discard
+    btrfs: discard,compress=lzo
+crypttabOptions: luks,keyscript=/bin/cat

calamares/modules/luksopenswaphookcfg.conf

@@ -0,0 +1,4 @@
+# Writes an openswap configuration with LUKS settings to the given path
+---
+# Path of the configuration file to write (in the target system)
+configFilePath: /etc/openswap.conf

calamares/modules/machineid.conf

@@ -0,0 +1,8 @@
+---
+# Whether to create /etc/machine-id for systemd.
+systemd: true
+# Whether to create /var/lib/dbus/machine-id for D-Bus.
+dbus: true
+# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
+# (ignored if dbus is false, or if there is no /etc/machine-id to point to).
+symlink: true

calamares/modules/mount.conf

@@ -0,0 +1,36 @@
+# Mount filesystems in the target (generally, before treating the
+# target as a usable chroot / "live" system). Filesystems are
+# automatically mounted from the partitioning module. Filesystems
+# listed here are **extra**. The filesystems listed in *extraMounts*
+# are mounted in all target systems. The filesystems listed in
+# *extraMountsEfi* are mounted in the target system **only** if
+# the host machine uses UEFI.
+---
+# Extra filesystems to mount. The key's value is a list of entries; each
+# entry has four keys:
+#   - device    The device node to mount
+#   - fs        The filesystem type to use
+#   - mountPoint Where to mount the filesystem
+#   - options (optional) Extra options to pass to mount(8)
+#
+extraMounts:
+    - device: proc
+      fs: proc
+      mountPoint: /proc
+    - device: sys
+      fs: sysfs
+      mountPoint: /sys
+    - device: /dev
+      mountPoint: /dev
+      options: bind
+    - device: tmpfs
+      fs: tmpfs
+      mountPoint: /run
+    - device: /run/udev
+      mountPoint: /run/udev
+      options: bind
+
+extraMountsEfi:
+    - device: efivarfs
+      fs: efivarfs
+      mountPoint: /sys/firmware/efi/efivars

calamares/modules/packages.conf

@@ -0,0 +1,13 @@
+backend: apt
+
+operations:
+  - remove:
+      - 'live-boot'
+      - 'live-boot-doc'
+      - 'live-config'
+      - 'live-config-doc'
+      - 'live-config-systemd'
+      - 'live-config-systemd'
+      - 'live-tools'
+      - 'live-task-localisation'
+      - 'live-task-recommended'

calamares/modules/unpackfs.conf

@@ -0,0 +1,5 @@
+---
+unpack:
+    -   source: "/run/live/medium/live/filesystem.squashfs"
+        sourcefs: "squashfs"
+        destination: ""

calamares/modules/users.conf

@@ -0,0 +1,17 @@
+---
+userGroup:       users
+defaultGroups:
+    - cdrom
+    - floppy
+    - sudo
+    - audio
+    - dip
+    - video
+    - plugdev
+    - netdev
+    - lpadmin
+    - scanner
+    - bluetooth
+autologinGroup:  autologin
+sudoersGroup:    sudo
+setRootPassword: false

calamares/modules/welcome.conf

@@ -0,0 +1,17 @@
+---
+showSupportUrl:         true
+showKnownIssuesUrl:     true
+showReleaseNotesUrl:    true
+
+requirements:
+    requiredStorage:    10
+    requiredRam:        1.0
+    check:
+        - storage
+        - ram
+        - power
+        - root
+    required:
+        - storage
+        - ram
+        - root

calamares/settings.conf

@@ -0,0 +1,91 @@
+# Configuration file for Calamares
+# Syntax is YAML 1.2
+---
+
+# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
+modules-search: [ local, /usr/lib/calamares/modules ]
+
+sequence:
+
+# Phase 1 - prepare.
+# View modules are shown as UI pages, jobs from job modules
+# are executed immediately in the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+- show:
+  - welcome
+  - locale
+  - keyboard
+  - partition
+  - users
+  - summary
+
+# Phase 2 - install.
+# View modules are not shown. Only the view modules shown
+# in the previous phase are allowed, their names should be
+# added here as placeholders to specify the order in which
+# view module jobs should be enqueued. Job modules are
+# also allowed.
+- exec:
+  - partition
+  - mount
+  - unpackfs
+  - sources-media
+  - machineid
+  - fstab
+  - locale
+  - keyboard
+  - localecfg
+  - users
+  - networkcfg
+  - hwclock
+  - services-systemd
+  - bootloader-config
+  - grubcfg
+  - bootloader
+  - packages
+  - luksbootkeyfile
+  - plymouthcfg
+  - initramfscfg
+  - initramfs
+  - sources-media-unmount
+  - sources-final
+  - umount
+
+# Phase 3 - postinstall.
+# View modules are shown as UI pages, jobs from job modules are
+# executed immediately in the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+- show:
+  - finished
+
+# A branding component is a directory, either in
+# SHARE/calamares/branding or in /etc/calamares/branding
+# (the latter takes precedence). The directory must contain a
+# YAML file branding.desc which may reference additional resources
+# (such as images) as paths relative to the current directory.
+# Only the name of the branding component (directory) should be
+# 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
+

conf/96_calamares-settings-debian.gschema.override

@@ -0,0 +1,10 @@
+# Launcher icons
+[org.gnome.shell]
+favorite-apps=['install-debian.desktop', 'firefox-esr.desktop', 'org.gnome.Evolution.desktop', 'rhythmbox.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'yelp.desktop']
+
+# We don't want the screensaver to enable on the live media while installing
+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
+
+[org.gnome.desktop.session]
+idle-delay=0

debian/changelog

@@ -1,3 +1,64 @@
+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
+  * Add libglib2.0-bin to build-depends
+
+ -- Jonathan Carter <jcc@debian.org>  Sat, 01 Dec 2018 11:40:55 +0200
+
+calamares-settings-debian (10.0.10-2) unstable; urgency=medium
+
+  * Fix diverts (Closes: #909492)
+
+ -- Jonathan Carter <jcc@debian.org>  Tue, 25 Sep 2018 14:32:01 +0200
+
+calamares-settings-debian (10.0.10-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 19 Sep 2018 10:58:27 +0200
+
+calamares-settings-debian (10.0.9-1) unstable; urgency=medium
+
+  * New usptream release
+  * Add divert to hide original Calamares icon
+  * Update standards version to 4.2.1
+
+ -- Jonathan Carter <jcc@debian.org>  Tue, 18 Sep 2018 20:17:54 +0200
+
+calamares-settings-debian (10.0.8-2) unstable; urgency=medium
+
+  * Fix watch file
+  * Update standards version to 4.2.0
+
+ -- Jonathan Carter <jcc@debian.org>  Thu, 09 Aug 2018 09:29:48 +0200
+
+calamares-settings-debian (10.0.8-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update watch file
+
+ -- Jonathan Carter <jcc@debian.org>  Mon, 25 Jun 2018 12:29:07 +0200
+
 calamares-settings-debian (10.0.3-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -2,8 +2,8 @@ Source: calamares-settings-debian
 Section: utils
 Priority: optional
 Maintainer: Jonathan Carter <jcc@debian.org>
-Build-Depends: debhelper (>= 11)
-Standards-Version: 4.1.4
+Build-Depends: debhelper (>= 11), 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/install

@@ -2,4 +2,6 @@ calamares etc
 calamares-modules/* usr/lib/calamares/modules
 scripts/* usr/sbin
 *.desktop usr/share/applications
+install-debian usr/bin
 artwork/install-debian.png usr/share/pixmaps
+conf/96_calamares-settings-debian.gschema.override usr/share/glib-2.0/schemas

debian/lintian-overrides

@@ -0,0 +1,5 @@
+# Only meant to be run by calamares, so its scripts wouldn't have manpages
+calamares-settings-debian: binary-without-manpage
+
+# We don't provide this file on purpose
+calamares-settings-debian: diversion-for-unknown-file

debian/postrm

@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    remove)
+        # Restore original Calamares icon 
+        dpkg-divert --quiet --rename --package calamares-settings-debian \
+                    --remove /usr/share/applications/calamares.desktop
+    ;;
+esac
+
+#DEBHELPER#

debian/preinst

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    install|upgrade)
+	# Hide upstream calamares icon when this package is installed
+        dpkg-divert --quiet --package calamares-settings-debian \
+                    --divert /usr/share/applications/calamares.desktop.orig \
+		    --rename /usr/share/applications/calamares.desktop
+    ;;
+esac
+
+#DEBHELPER#

debian/watch

@@ -0,0 +1,2 @@
+version=4
+https://salsa.debian.org/live-team/calamares-settings-debian/tags .*/calamares-settings-debian-(.*)\.tar\.gz

install-debian

@@ -0,0 +1,15 @@
+#!/bin/sh
+###
+# 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
+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

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Install Debian
+GenericName=Calamares Installer
+Exec=install-debian
+Comment=Calamares — Installer for Debian Live
+Keywords=calamares;system;install;debian;installer
+Icon=install-debian
+Terminal=false
+Categories=Qt;System;
+StartupWMClass=calamares
+StartupNotify=True

scripts/bootloader-config

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+
+echo "Running bootloader-config..."
+
+if [ -d /sys/firmware/efi/efivars ]; then
+    echo " * Installing grub-efi (uefi)..."
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64 cryptsetup keyutils
+else
+    echo " * install grub... (bios)"
+    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils
+fi

scripts/sources-final

@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Writes the final sources.list file
+#
+
+CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+RELEASE="buster"
+
+cat << EOF > $CHROOT/etc/apt/sources.list
+# See https://wiki.debian.org/SourcesList for more information.
+deb http://deb.debian.org/debian $RELEASE main
+deb-src http://deb.debian.org/debian $RELEASE main
+
+deb http://deb.debian.org/debian $RELEASE-updates main
+deb-src http://deb.debian.org/debian $RELEASE-updates main
+
+deb http://security.debian.org/debian-security/ $RELEASE/updates main
+deb-src http://security.debian.org/debian-security/ $RELEASE/updates main
+EOF
+
+exit 0

scripts/sources-media

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+MEDIUM_PATH="/run/live/medium"
+RELEASE="buster"
+
+if [ "$1" = "-u" ]; then
+    umount $CHROOT/$MEDIUM_PATH
+    rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list
+    chroot $CHROOT apt-get update
+    exit 0
+fi
+
+# Remove the base sources, we will configure sources in a later phase
+rm -f $CHROOT/etc/apt/sources.list.d/base.list
+
+mkdir -p $CHROOT/$MEDIUM_PATH
+mount --bind $MEDIUM_PATH $CHROOT/$MEDIUM_PATH
+echo "deb [trusted=yes] file:$MEDIUM_PATH $RELEASE main" > $CHROOT/etc/apt/sources.list.d/debian-live-media.list
+chroot $CHROOT apt-get update
+# Attempt safest way to remove cruft
+rmdir $CHROOT/run/live/medium
+rmdir $CHROOT/run/live
+
+exit 0