New upstream release

2019-02-15 16:08:17 +02:00 · 2019-01-16 19:15:31 +02:00 · 2019-01-16 12:16:25 +02:00 · 2019-01-09 14:00:37 +02:00 · 2019-01-08 10:50:15 +02:00 · 2018-12-16 14:29:13 +02:00
15 changed files with 107 additions and 17 deletions
@@ -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
@@ -11,3 +11,4 @@ operations:
      - 'live-tools'
      - 'live-task-localisation'
      - 'live-task-recommended'
+      - 'calamares-settings-debian'
@@ -10,7 +10,6 @@ requirements:
        - storage
        - ram
        - power
-        - internet
        - root
    required:
        - storage
@@ -29,7 +29,7 @@ sequence:
  - partition
  - mount
  - unpackfs
-  - sources-media 
+  - sources-media
  - machineid
  - fstab
  - locale
@@ -44,7 +44,7 @@ sequence:
  - bootloader
  - packages
  - luksbootkeyfile
-  - luksopenswaphookcfg
+  - plymouthcfg
  - initramfscfg
  - initramfs
  - sources-media-unmount
@@ -67,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
+
@@ -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
@@ -1,6 +1,49 @@
+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
+  * 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) 
+  * Fix diverts (Closes: #909492)

 -- Jonathan Carter <jcc@debian.org>  Tue, 25 Sep 2018 14:32:01 +0200

@@ -1 +0,0 @@
-11
@@ -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.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.
@@ -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
@@ -1,8 +1,5 @@
 # Only meant to be run by calamares, so its scripts wouldn't have manpages
 calamares-settings-debian: binary-without-manpage

-# sudo is from another package but validly so
-calamares-settings-debian: desktop-command-not-in-package
-
 # We don't provide this file on purpose
 calamares-settings-debian: diversion-for-unknown-file
@@ -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
@@ -3,9 +3,11 @@ Type=Application
 Version=1.0
 Name=Install Debian
 GenericName=Calamares Installer
-Exec=sudo /usr/bin/calamares
+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
Author	SHA1	Message	Date
Jonathan Carter	6b89773a85	New upstream release	2019-02-15 16:08:17 +02:00
Jonathan Carter	98abeec1c0	New upstream release	2019-01-16 19:15:31 +02:00
Jonathan Carter	d9134ca843	New upstream release	2019-01-16 12:16:25 +02:00
Jonathan Carter	3c596e4f06	Fix desc	2019-01-09 14:00:37 +02:00
Jonathan Carter	411ed1dcd8	New upstream version	2019-01-08 10:50:15 +02:00
Jonathan Carter	51ca364b40	New upstream release	2018-12-16 14:29:13 +02:00
Jonathan Carter	c3a993c3b7	Commit upstream changes	2018-12-01 19:37:38 +02:00
Jonathan Carter	d137b66265	Add install-debian wrapper	2018-11-23 22:23:02 +02:00