Compare commits

...

10 Commits

Author SHA1 Message Date
Jonathan Carter 02f1f852cc New upstream release 2023-03-06 12:35:42 +02:00
Jonathan Carter 3e977929fb New release 2022-08-02 09:37:49 +02:00
Jonathan Carter b348bf4fb8 New upstream release 2022-05-19 14:51:59 +02:00
Jonathan Carter 440efe3275 New release 2022-05-12 21:07:10 +02:00
Jonathan Carter f06d21fe19 Merge branch 'lintian-fixes' into 'master'
Fix some issues reported by lintian

See merge request live-team/calamares-settings-debian-packaging!1
2022-02-18 09:13:41 +00:00
Debian Janitor a485f47a54 Update standards version to 4.6.0, no changes needed.
Changes-By: lintian-brush
Fixes: lintian: out-of-date-standards-version
See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html
2021-10-12 20:09:16 +00:00
Debian Janitor 8773ee70d0 Set upstream metadata fields: Repository, Repository-Browse.
Changes-By: lintian-brush
Fixes: lintian: upstream-metadata-file-is-missing
See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html
Fixes: lintian: upstream-metadata-missing-repository
See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html
2021-10-12 20:09:15 +00:00
Jonathan Carter 06541f170d Fix security entries in sources.list 2021-09-06 08:46:17 +02:00
Jonathan Carter 23079c258a New upstream release 2020-11-11 14:55:50 +02:00
Jonathan Carter a5414fb381 New upstream release 2020-10-21 09:33:30 +02:00
17 changed files with 192 additions and 14 deletions
+28
View File
@@ -1,3 +1,31 @@
[ 12.0.4 ]
* Update artwork for Debian 12 (emerald theme)
* Make installer slide translatable
[ 12.0.3 ]
* Work around hidpi issue (#992162)
[ 12.0.2 ]
* Fix dpkg-unsafe-io and dpkg-unsafe-io-undo names
* Update the sources-media script to use bookworm
[ 12.0.1 ]
* Initial branding description and sources.list changes for bookworm
* Add dpkg-unsafe-io module to speed up post-installation
(Debian bug: #984794)
[ 11.0.3 ]
* Update settings.conf with changes from recent releases
* Update sources.list to include updates security path
(Debian bug: #969930)
* Store host entropy in urandom and systemd location
(Debian bug: #941301)
[ 11.0.2 ]
* Use xdg-user-dir to specify Desktop path
@@ -0,0 +1,6 @@
---
type: "job"
name: "dpkg-unsafe-io-undo"
interface: "process"
command: "/usr/sbin/dpkg-unsafe-io -u"
timeout: 600
@@ -0,0 +1,6 @@
---
type: "job"
name: "dpkg-unsafe-io"
interface: "process"
command: "/usr/sbin/dpkg-unsafe-io"
timeout: 600
+16 -6
View File
@@ -1,23 +1,30 @@
---
componentName: debian
welcomeStyleCalamares: true
welcomeExpandingLogo: true
windowExpanding: normal
windowSize: 800px,520px
windowPlacement: center
strings:
productName: Debian GNU/Linux
shortProductName: Debian testing
version: 11 (bullseye)
shortVersion: 11
versionedName: Debian 11 (bullseye)
shortVersionedName: Debian 11
shortProductName: Debian
version: 12 (bookworm)
shortVersion: 12
versionedName: Debian 12 (bookworm)
shortVersionedName: Debian 12
bootloaderEntryName: Debian
productUrl: https://debian.org
supportUrl: https://www.debian.org/support
releaseNotesUrl: https://www.debian.org/releases/bullseye/releasenotes
knownIssuesUrl: https://bugs.debian.org
releaseNotesUrl: https://www.debian.org/releases/bookworm/releasenotes
donateUrl: https://www.debian.org
images:
productLogo: "debian-logo.png"
productIcon: "debian-logo.png"
productWelcome: "welcome.png"
# productWallpaper: "wallpaper.png"
slideshow: "show.qml"
@@ -25,3 +32,6 @@ style:
sidebarBackground: "#2c3133"
sidebarText: "#FFFFFF"
sidebarTextSelect: "#4d7079"
sidebarTextSelect: "#292F34"
slideshowAPI: 2
Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 20 KiB

+2 -2
View File
@@ -40,8 +40,8 @@ Presentation
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."
text: qsTr("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
Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 113 KiB

+7
View File
@@ -6,3 +6,10 @@ 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
# Whether to copy entropy from the host
entropy-copy: true
# Which files to write (paths in the target)
entropy-files:
- /var/lib/urandom/random-seed
- /var/lib/systemd/random-seed
+36 -1
View File
@@ -5,8 +5,41 @@
# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
modules-search: [ local, /usr/lib/calamares/modules ]
sequence:
# If this is set to true, Calamares refers to itself as a "setup program"
# rather than an "installer". Defaults to the value of dont-chroot, but
# Calamares will complain if this is not explicitly set.
oem-setup: false
# If this is set to true, the "Cancel" button will be disabled entirely.
# The button is also hidden from view.
#
# This can be useful if when e.g. Calamares is used as a post-install
# configuration tool and you require the user to go through all the
# configuration steps.
#
# Default is false, but Calamares will complain if this is not explicitly set.
#
# YAML: boolean.
disable-cancel: false
# If this is set to true, the "Cancel" button will be disabled once
# you start the 'Installation', meaning there won't be a way to cancel
# the Installation until it has finished or installation has failed.
#
# Default is false, but Calamares will complain if this is not explicitly set.
#
# YAML: boolean.
disable-cancel-during-exec: false
# If this is set to true, then once the end of the sequence has
# been reached, the quit (done) button is clicked automatically
# and Calamares will close. Default is false: the user will see
# that the end of installation has been reached, and that things are ok.
#
#
quit-at-end: false
sequence:
# Phase 1 - prepare.
# View modules are shown as UI pages, jobs from job modules
# are executed immediately in the background.
@@ -29,6 +62,7 @@ sequence:
- partition
- mount
- unpackfs
- dpkg-unsafe-io
- sources-media
- machineid
- fstab
@@ -48,6 +82,7 @@ sequence:
- plymouthcfg
- initramfscfg
- initramfs
- dpkg-unsafe-io-undo
- sources-media-unmount
- sources-final
- umount
+59
View File
@@ -1,3 +1,62 @@
calamares-settings-debian (12.0.4-1) unstable; urgency=medium
* New upstream release
- Bookworm artwork
- Make installer slide translatable
-- Jonathan Carter <jcc@debian.org> Mon, 06 Mar 2023 12:33:33 +0200
calamares-settings-debian (12.0.3-1) unstable; urgency=medium
* New upstream release
(work arounds hidpi issue, Closes: #992162)
-- Jonathan Carter <jcc@debian.org> Tue, 02 Aug 2022 09:35:26 +0200
calamares-settings-debian (12.0.2-1) unstable; urgency=medium
* New upstream release
-- Jonathan Carter <jcc@debian.org> Thu, 19 May 2022 14:51:29 +0200
calamares-settings-debian (12.0.1-1) unstable; urgency=medium
[ Debian Janitor ]
* Set upstream metadata fields: Repository, Repository-Browse.
* Update standards version to 4.6.0, no changes needed.
[ Jonathan Carter ]
* New release
- Use force-unsafe-io to speed up dpkg actions (Closes: #984794)
-- Jonathan Carter <jcc@debian.org> Mon, 09 May 2022 13:37:12 +0200
calamares-settings-debian (11.0.5-2) unstable; urgency=medium
* Add supplimental information to previous changelog entry
-- Jonathan Carter <jcc@debian.org> Mon, 26 Jul 2021 10:27:12 +0200
calamares-settings-debian (11.0.5-1) unstable; urgency=medium
* New upstream release
- Corrects the apt sources for security updates (Closes: #991474)
-- Jonathan Carter <jcc@debian.org> Sun, 25 Jul 2021 14:10:24 +0200
calamares-settings-debian (11.0.4-1) unstable; urgency=medium
* New upstream release
-- Jonathan Carter <jcc@debian.org> Wed, 11 Nov 2020 14:54:50 +0200
calamares-settings-debian (11.0.3-1) unstable; urgency=medium
* New upstream release
(Closes: #969930, #941301)
-- Jonathan Carter <jcc@debian.org> Sun, 18 Oct 2020 19:48:10 +0200
calamares-settings-debian (11.0.2-1) unstable; urgency=medium
* New upstream release
+1 -1
View File
@@ -3,7 +3,7 @@ Section: utils
Priority: optional
Maintainer: Jonathan Carter <jcc@debian.org>
Build-Depends: debhelper-compat (= 13), libglib2.0-bin
Standards-Version: 4.5.0
Standards-Version: 4.6.0
Rules-Requires-Root: no
Homepage: https://salsa.debian.org/live-team/calamares-settings-debian
Vcs-Git: https://salsa.debian.org/live-team/calamares-settings-debian-packaging.git
+3
View File
@@ -0,0 +1,3 @@
---
Repository: https://salsa.debian.org/live-team/calamares-settings-debian.git
Repository-Browse: https://salsa.debian.org/live-team/calamares-settings-debian
+11
View File
@@ -6,6 +6,17 @@
# Stale file left behind by live-build that messes with partitioning
sudo mv /etc/fstab /etc/fstab.orig.calamares
# Allow Calamares to scale the window for hidpi displays
# This is fixed in the Calamares 3.3.0 series, so we can remove this
# once we switch to that
# Upstream commit that will make this obsolete:
# https://github.com/calamares/calamares/commit/e9f011b686a0982fb7828e8ac02a8e0784d3b11f
# Upstream bug:
# https://github.com/calamares/calamares/issues/1945
# Debian bug:
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992162
export QT_AUTO_SCREEN_SCALE_FACTOR=1
# Access control to run calamares as root for xwayland
xhost +si:localuser:root
pkexec calamares
+13
View File
@@ -0,0 +1,13 @@
#!/bin/sh
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
if [ "$1" = "-u" ]; then
rm $CHROOT/etc/dpkg/dpkg.cfg.d/calamares-force-unsafe-io
sync
exit 0
fi
echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/calamares-force-unsafe-io
exit 0
+3 -3
View File
@@ -4,7 +4,7 @@
#
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
RELEASE="bullseye"
RELEASE="bookworm"
cat << EOF > $CHROOT/etc/apt/sources.list
# See https://wiki.debian.org/SourcesList for more information.
@@ -14,8 +14,8 @@ 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
deb http://security.debian.org/debian-security/ $RELEASE-security main
deb-src http://security.debian.org/debian-security/ $RELEASE-security main
EOF
exit 0
+1 -1
View File
@@ -2,7 +2,7 @@
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
MEDIUM_PATH="/run/live/medium"
RELEASE="bullseye"
RELEASE="bookworm"
if [ "$1" = "-u" ]; then
umount $CHROOT/$MEDIUM_PATH