From 5356eeab97c649df66e2c244cc403bd7ec720f38 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sun, 10 Mar 2024 18:13:54 -0500 Subject: [PATCH] Good bye Ubuntu Studio, we miss you. Come back anytime! --- Makefile | 4 - .../ubuntustudio}/README.md | 8 +- .../branding/ubuntustudio/Art.png | Bin .../branding/ubuntustudio/Audio.png | Bin .../branding/ubuntustudio/FindUs.png | Bin .../branding/ubuntustudio/NewLook.png | Bin .../branding/ubuntustudio/Photography.png | Bin .../branding/ubuntustudio/Software.png | Bin .../branding/ubuntustudio/Video.png | Bin .../branding/ubuntustudio/branding.desc | 0 .../branding/ubuntustudio/icon.png | Bin .../branding/ubuntustudio/lang/Makefile | 0 .../ubuntustudio/lang/calamares-lubuntu_ar.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_be.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_ca.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_da.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_de.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_el.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_es.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_et.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_eu.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_fr.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_gl.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_it.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_ko.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_no.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_pl.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_pt.ts | 0 .../lang/calamares-lubuntu_pt_BR.ts | 0 .../ubuntustudio/lang/calamares-lubuntu_ru.ts | 0 .../lang/calamares-lubuntu_zh-hans.ts | 0 .../branding/ubuntustudio/logo.png | Bin .../branding/ubuntustudio/show.qml | 0 .../branding/ubuntustudio/stylesheet.qss | 0 .../branding/ubuntustudio/welcome.png | Bin .../ubuntustudio}/calamaresrc | 0 .../ubuntustudio}/kded_device_automounterrc | 0 .../calamares-settings-ubuntustudio.install | 7 -- ...es-settings-ubuntustudio.lintian-overrides | 8 -- debian/changelog | 8 +- debian/control | 12 --- ubuntustudio/calamares-logs-helper | 24 ------ .../modules/after_bootloader_context.conf | 5 -- ubuntustudio/modules/automirror.conf | 6 -- ubuntustudio/modules/displaymanager.conf | 9 --- ubuntustudio/modules/packages.conf | 15 ---- ubuntustudio/modules/partition.conf | 8 -- .../modules/shellprocess_fix_audio_perms.conf | 9 --- ubuntustudio/modules/unpackfs.conf | 6 -- ubuntustudio/modules/users.conf | 24 ------ ubuntustudio/modules/welcome.conf | 25 ------ ubuntustudio/po/Makefile | 22 ------ ubuntustudio/po/POTFILES.in | 1 - ubuntustudio/po/ar.po | 28 ------- ubuntustudio/po/be.po | 25 ------ ubuntustudio/po/ca.po | 27 ------- .../po/calamares-settings-lubuntu.pot | 30 -------- ubuntustudio/po/da.po | 27 ------- ubuntustudio/po/de.po | 27 ------- ubuntustudio/po/el.po | 25 ------ ubuntustudio/po/es.po | 27 ------- ubuntustudio/po/et.po | 25 ------ ubuntustudio/po/eu.po | 25 ------ ubuntustudio/po/fr.po | 27 ------- ubuntustudio/po/gl.po | 25 ------ ubuntustudio/po/it.po | 32 -------- ubuntustudio/po/ko.po | 25 ------ ubuntustudio/po/no.po | 27 ------- ubuntustudio/po/pl.po | 28 ------- ubuntustudio/po/pt.po | 27 ------- ubuntustudio/po/pt_BR.po | 27 ------- ubuntustudio/po/ru.po | 30 -------- ubuntustudio/po/zh-hans.po | 30 -------- ubuntustudio/settings.conf | 71 ------------------ .../ubuntustudio-calamares.desktop.in | 12 --- 75 files changed, 12 insertions(+), 816 deletions(-) rename {ubuntustudio => archive/ubuntustudio}/README.md (68%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/Art.png (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/Audio.png (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/FindUs.png (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/NewLook.png (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/Photography.png (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/Software.png (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/Video.png (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/branding.desc (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/icon.png (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/Makefile (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_ar.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_be.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_ca.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_da.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_de.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_el.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_es.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_et.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_eu.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_fr.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_gl.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_it.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_ko.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_no.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_pl.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_pt.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_pt_BR.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_ru.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/lang/calamares-lubuntu_zh-hans.ts (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/logo.png (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/show.qml (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/stylesheet.qss (100%) rename {ubuntustudio => archive/ubuntustudio}/branding/ubuntustudio/welcome.png (100%) rename {ubuntustudio => archive/ubuntustudio}/calamaresrc (100%) rename {ubuntustudio => archive/ubuntustudio}/kded_device_automounterrc (100%) delete mode 100644 debian/calamares-settings-ubuntustudio.install delete mode 100644 debian/calamares-settings-ubuntustudio.lintian-overrides delete mode 100755 ubuntustudio/calamares-logs-helper delete mode 100644 ubuntustudio/modules/after_bootloader_context.conf delete mode 100644 ubuntustudio/modules/automirror.conf delete mode 100644 ubuntustudio/modules/displaymanager.conf delete mode 100644 ubuntustudio/modules/packages.conf delete mode 100644 ubuntustudio/modules/partition.conf delete mode 100644 ubuntustudio/modules/shellprocess_fix_audio_perms.conf delete mode 100644 ubuntustudio/modules/unpackfs.conf delete mode 100644 ubuntustudio/modules/users.conf delete mode 100644 ubuntustudio/modules/welcome.conf delete mode 100755 ubuntustudio/po/Makefile delete mode 100644 ubuntustudio/po/POTFILES.in delete mode 100644 ubuntustudio/po/ar.po delete mode 100644 ubuntustudio/po/be.po delete mode 100644 ubuntustudio/po/ca.po delete mode 100644 ubuntustudio/po/calamares-settings-lubuntu.pot delete mode 100644 ubuntustudio/po/da.po delete mode 100644 ubuntustudio/po/de.po delete mode 100644 ubuntustudio/po/el.po delete mode 100644 ubuntustudio/po/es.po delete mode 100644 ubuntustudio/po/et.po delete mode 100644 ubuntustudio/po/eu.po delete mode 100644 ubuntustudio/po/fr.po delete mode 100644 ubuntustudio/po/gl.po delete mode 100644 ubuntustudio/po/it.po delete mode 100644 ubuntustudio/po/ko.po delete mode 100644 ubuntustudio/po/no.po delete mode 100644 ubuntustudio/po/pl.po delete mode 100644 ubuntustudio/po/pt.po delete mode 100644 ubuntustudio/po/pt_BR.po delete mode 100644 ubuntustudio/po/ru.po delete mode 100644 ubuntustudio/po/zh-hans.po delete mode 100644 ubuntustudio/settings.conf delete mode 100644 ubuntustudio/ubuntustudio-calamares.desktop.in diff --git a/Makefile b/Makefile index 025dbdb..ec96a6b 100755 --- a/Makefile +++ b/Makefile @@ -5,11 +5,9 @@ all: # Desktop file (cd lubuntu/po/ && make) - (cd ubuntustudio/po/ && make) (cd kubuntu/po/ && make) # Slideshow (cd lubuntu/branding/lubuntu/lang/ && make) - (cd ubuntustudio/branding/ubuntustudio/lang && make) # basicwallpaper (cd common/basicwallpaper && mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release && make) # Lubuntu OEM setup stuff @@ -45,8 +43,6 @@ all: # Get rid of the unnecessary files find lubuntu/ -type f -iname "*.in" | xargs rm -f find lubuntu/ -type f -iname "Makefile" | xargs rm -f - find ubuntustudio/ -type f -iname "*.in" | xargs rm -f - find ubuntustudio/ -type f -iname "Makefile" | xargs rm -f find kubuntu/ -type f -iname "*.in" | xargs rm -f find kubuntu/ -type f -iname "Makefile" | xargs rm -f rm -rf kubuntu/oemconfig diff --git a/ubuntustudio/README.md b/archive/ubuntustudio/README.md similarity index 68% rename from ubuntustudio/README.md rename to archive/ubuntustudio/README.md index 132e449..30218a4 100644 --- a/ubuntustudio/README.md +++ b/archive/ubuntustudio/README.md @@ -1,6 +1,10 @@ -# Ubuntu Studio's Calamares Settings +# Ubuntu Studio's Calamares Branding (archived) -This directory houses the Calamares settings for Ubuntu Studio. +This directory houses the branding Ubuntu Studio used when Calamares was still +being used as the installer, along with some additional potentially useful +configuration fragments. Ubuntu Studio has since switched to using +ubuntu-desktop-provision, and thus most of the actual configuration has been +removed. Unless otherwise stated, the contents of this directory are licensed as follows: diff --git a/ubuntustudio/branding/ubuntustudio/Art.png b/archive/ubuntustudio/branding/ubuntustudio/Art.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/Art.png rename to archive/ubuntustudio/branding/ubuntustudio/Art.png diff --git a/ubuntustudio/branding/ubuntustudio/Audio.png b/archive/ubuntustudio/branding/ubuntustudio/Audio.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/Audio.png rename to archive/ubuntustudio/branding/ubuntustudio/Audio.png diff --git a/ubuntustudio/branding/ubuntustudio/FindUs.png b/archive/ubuntustudio/branding/ubuntustudio/FindUs.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/FindUs.png rename to archive/ubuntustudio/branding/ubuntustudio/FindUs.png diff --git a/ubuntustudio/branding/ubuntustudio/NewLook.png b/archive/ubuntustudio/branding/ubuntustudio/NewLook.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/NewLook.png rename to archive/ubuntustudio/branding/ubuntustudio/NewLook.png diff --git a/ubuntustudio/branding/ubuntustudio/Photography.png b/archive/ubuntustudio/branding/ubuntustudio/Photography.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/Photography.png rename to archive/ubuntustudio/branding/ubuntustudio/Photography.png diff --git a/ubuntustudio/branding/ubuntustudio/Software.png b/archive/ubuntustudio/branding/ubuntustudio/Software.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/Software.png rename to archive/ubuntustudio/branding/ubuntustudio/Software.png diff --git a/ubuntustudio/branding/ubuntustudio/Video.png b/archive/ubuntustudio/branding/ubuntustudio/Video.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/Video.png rename to archive/ubuntustudio/branding/ubuntustudio/Video.png diff --git a/ubuntustudio/branding/ubuntustudio/branding.desc b/archive/ubuntustudio/branding/ubuntustudio/branding.desc similarity index 100% rename from ubuntustudio/branding/ubuntustudio/branding.desc rename to archive/ubuntustudio/branding/ubuntustudio/branding.desc diff --git a/ubuntustudio/branding/ubuntustudio/icon.png b/archive/ubuntustudio/branding/ubuntustudio/icon.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/icon.png rename to archive/ubuntustudio/branding/ubuntustudio/icon.png diff --git a/ubuntustudio/branding/ubuntustudio/lang/Makefile b/archive/ubuntustudio/branding/ubuntustudio/lang/Makefile similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/Makefile rename to archive/ubuntustudio/branding/ubuntustudio/lang/Makefile diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ar.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ar.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ar.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ar.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_be.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_be.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_be.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_be.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ca.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ca.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ca.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ca.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_da.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_da.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_da.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_da.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_de.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_de.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_de.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_de.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_el.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_el.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_el.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_el.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_es.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_es.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_es.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_es.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_et.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_et.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_et.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_et.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_eu.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_eu.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_eu.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_eu.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_fr.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_fr.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_fr.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_fr.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_gl.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_gl.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_gl.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_gl.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_it.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_it.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_it.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_it.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ko.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ko.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ko.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ko.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_no.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_no.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_no.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_no.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pl.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pl.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pl.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pl.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pt.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pt.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pt.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pt.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pt_BR.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pt_BR.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pt_BR.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_pt_BR.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ru.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ru.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ru.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_ru.ts diff --git a/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_zh-hans.ts b/archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_zh-hans.ts similarity index 100% rename from ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_zh-hans.ts rename to archive/ubuntustudio/branding/ubuntustudio/lang/calamares-lubuntu_zh-hans.ts diff --git a/ubuntustudio/branding/ubuntustudio/logo.png b/archive/ubuntustudio/branding/ubuntustudio/logo.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/logo.png rename to archive/ubuntustudio/branding/ubuntustudio/logo.png diff --git a/ubuntustudio/branding/ubuntustudio/show.qml b/archive/ubuntustudio/branding/ubuntustudio/show.qml similarity index 100% rename from ubuntustudio/branding/ubuntustudio/show.qml rename to archive/ubuntustudio/branding/ubuntustudio/show.qml diff --git a/ubuntustudio/branding/ubuntustudio/stylesheet.qss b/archive/ubuntustudio/branding/ubuntustudio/stylesheet.qss similarity index 100% rename from ubuntustudio/branding/ubuntustudio/stylesheet.qss rename to archive/ubuntustudio/branding/ubuntustudio/stylesheet.qss diff --git a/ubuntustudio/branding/ubuntustudio/welcome.png b/archive/ubuntustudio/branding/ubuntustudio/welcome.png similarity index 100% rename from ubuntustudio/branding/ubuntustudio/welcome.png rename to archive/ubuntustudio/branding/ubuntustudio/welcome.png diff --git a/ubuntustudio/calamaresrc b/archive/ubuntustudio/calamaresrc similarity index 100% rename from ubuntustudio/calamaresrc rename to archive/ubuntustudio/calamaresrc diff --git a/ubuntustudio/kded_device_automounterrc b/archive/ubuntustudio/kded_device_automounterrc similarity index 100% rename from ubuntustudio/kded_device_automounterrc rename to archive/ubuntustudio/kded_device_automounterrc diff --git a/debian/calamares-settings-ubuntustudio.install b/debian/calamares-settings-ubuntustudio.install deleted file mode 100644 index 1aa5be2..0000000 --- a/debian/calamares-settings-ubuntustudio.install +++ /dev/null @@ -1,7 +0,0 @@ -ubuntustudio/branding/ etc/calamares/ -ubuntustudio/calamares-logs-helper usr/bin/ -ubuntustudio/calamaresrc etc/xdg -ubuntustudio/kded_device_automounterrc etc/xdg -ubuntustudio/modules/ etc/calamares/ -ubuntustudio/settings.conf etc/calamares/ -ubuntustudio/ubuntustudio-calamares.desktop usr/share/applications/ diff --git a/debian/calamares-settings-ubuntustudio.lintian-overrides b/debian/calamares-settings-ubuntustudio.lintian-overrides deleted file mode 100644 index a948b89..0000000 --- a/debian/calamares-settings-ubuntustudio.lintian-overrides +++ /dev/null @@ -1,8 +0,0 @@ -# The .desktop file uses bash to run firefox as the local -# user. bash is included in the system. -calamares-settings-ubuntustudio: desktop-command-not-in-package bash [usr/share/applications/ubuntustudio-calamares.desktop] -# there will be no manpage in the foreseeable future -calamares-settings-ubuntustudio: no-manual-page [usr/bin/calamares-logs-helper] -# We're just extracting a log file and preserving it for the user to look at -# after the installation, this is normal. -calamares-settings-ubuntustudio: uses-dpkg-database-directly [usr/bin/calamares-logs-helper] diff --git a/debian/changelog b/debian/changelog index 4126804..2c10a5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -calamares-settings-ubuntu (1:24.04.17) UNRELEASED; urgency=medium +calamares-settings-ubuntu (1:24.04.17) noble; urgency=medium [ Neal Gompa ] * debian/control: Define the flavor packages as swappable packages - -- Aaron Rainbolt Fri, 01 Mar 2024 13:01:09 -0600 + [ Aaron Rainbolt ] + * Wipe Ubuntu Studio's configuration while preserving branding, Studio now + uses ubuntu-desktop-provision. + + -- Aaron Rainbolt Sun, 10 Mar 2024 18:10:03 -0500 calamares-settings-ubuntu (1:24.04.16) noble; urgency=medium diff --git a/debian/control b/debian/control index 5015c8e..4699d5d 100644 --- a/debian/control +++ b/debian/control @@ -64,15 +64,3 @@ Description: Common Calamares Settings This package contains the common Calamares settings for all flavors. There is also a automirror Python script to set sources based on geolocation. - -Package: calamares-settings-ubuntustudio -Architecture: all -Depends: calamares-settings-ubuntu-common (>= ${binary:Version}), - ${misc:Depends} -Conflicts: calamares-settings-ubuntu-flavor -Provides: calamares-settings-ubuntu-flavor -Description: Ubuntu Studio Calamares Settings and Branding - This package contains the Calamares settings and branding for Ubuntu Studio. - As part of the branding the installer slideshow is contained within. - The settings ensure a proper Ubuntu Studio desktop is installed with the - KDE Plasma desktop environment. diff --git a/ubuntustudio/calamares-logs-helper b/ubuntustudio/calamares-logs-helper deleted file mode 100755 index aa42a4d..0000000 --- a/ubuntustudio/calamares-logs-helper +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -ex - -root=$1 -install_dir=$root/var/log/installer -[ -d $install_dir ] || mkdir -p $install_dir - -cp /home/ubuntu-studio/.cache/calamares/session.log $install_dir/debug - -cp /cdrom/.disk/info $install_dir/media-info -cp /var/log/casper.log $install_dir/casper.log -cp /var/log/syslog $install_dir/syslog - -gzip --stdout $root/var/lib/dpkg/status > $install_dir/initial-status.gz - -# OEM id isn't a thing, when in OEM mode ubiquity would also archive that. -# https://github.com/calamares/calamares/issues/943 - -chmod -v 600 $install_dir/* -# Make these world readable, they can absolutely not contain anything relevant -# to security. -chmod -v 644 $install_dir/initial-status.gz -chmod -v 644 $install_dir/media-info diff --git a/ubuntustudio/modules/after_bootloader_context.conf b/ubuntustudio/modules/after_bootloader_context.conf deleted file mode 100644 index 44ada27..0000000 --- a/ubuntustudio/modules/after_bootloader_context.conf +++ /dev/null @@ -1,5 +0,0 @@ ---- -dontChroot: false -timeout: 120 -firmwareType: - "*": "-rm ${ROOT}/home/${USER}/Desktop/ubuntustudio-calamares.desktop" diff --git a/ubuntustudio/modules/automirror.conf b/ubuntustudio/modules/automirror.conf deleted file mode 100644 index 27c7797..0000000 --- a/ubuntustudio/modules/automirror.conf +++ /dev/null @@ -1,6 +0,0 @@ ---- -baseUrl: archive.ubuntu.com -distribution: Ubuntu Studio -geoip: - style: "json" - url: "https://ipapi.co/json" diff --git a/ubuntustudio/modules/displaymanager.conf b/ubuntustudio/modules/displaymanager.conf deleted file mode 100644 index ccee346..0000000 --- a/ubuntustudio/modules/displaymanager.conf +++ /dev/null @@ -1,9 +0,0 @@ -displaymanagers: - - sddm - -defaultDesktopEnvironment: - executable: "startplasma-x11" - desktopFile: "Ubuntu Studio" - -basicSetup: false -sysconfigSetup: false diff --git a/ubuntustudio/modules/packages.conf b/ubuntustudio/modules/packages.conf deleted file mode 100644 index 6d6cb05..0000000 --- a/ubuntustudio/modules/packages.conf +++ /dev/null @@ -1,15 +0,0 @@ -update_db: true -backend: apt -operations: - - remove: - - "^live-*" - - calamares-settings-ubuntustudio - - calamares - - cifs-utils - - try_install: - - language-pack-$LOCALE - - language-pack-gnome-$LOCALE - - language-pack-kde-$LOCALE - - hunspell-$LOCALE - - libreoffice-help-$LOCALE - - libreoffice-l10n-$LOCALE diff --git a/ubuntustudio/modules/partition.conf b/ubuntustudio/modules/partition.conf deleted file mode 100644 index 14fc1ca..0000000 --- a/ubuntustudio/modules/partition.conf +++ /dev/null @@ -1,8 +0,0 @@ -efiSystemPartition: "/boot/efi" -enableLuksAutomatedPartitioning: true -userSwapChoices: - - none - - small -initialSwapChoice: small -drawNestedPartitions: true -defaultFileSystemType: "ext4" diff --git a/ubuntustudio/modules/shellprocess_fix_audio_perms.conf b/ubuntustudio/modules/shellprocess_fix_audio_perms.conf deleted file mode 100644 index 04a1a5d..0000000 --- a/ubuntustudio/modules/shellprocess_fix_audio_perms.conf +++ /dev/null @@ -1,9 +0,0 @@ ---- -dontChroot: false -timeout: 30 -script: - - command: "if [ -f /etc/security/limits.d/audio.conf.disabled ]; then mv /etc/security/limits.d/audio.conf.disabled /etc/security/limits.d/audio.conf; fi" - timeout: 10 - - command: "if [ -f /etc/apt/sources.list.d/dvd.list ]; then rm /etc/apt/sources.list.d/dvd.list; fi" - timeout: 10 - \ No newline at end of file diff --git a/ubuntustudio/modules/unpackfs.conf b/ubuntustudio/modules/unpackfs.conf deleted file mode 100644 index 79e7be3..0000000 --- a/ubuntustudio/modules/unpackfs.conf +++ /dev/null @@ -1,6 +0,0 @@ ---- -unpack: - - source: "/cdrom/casper/filesystem.squashfs" - sourcefs: "squashfs" - destination: "" - excludeFile: "/etc/apt/sources.list.d/dvd.list" diff --git a/ubuntustudio/modules/users.conf b/ubuntustudio/modules/users.conf deleted file mode 100644 index 44b34b5..0000000 --- a/ubuntustudio/modules/users.conf +++ /dev/null @@ -1,24 +0,0 @@ ---- -doAutologin: false -setRootPassword: false -sudoersGroup: sudo -defaultGroups: - - adm - - cdrom - - dip - - lpadmin - - plugdev - - name: sambashare - must_exist: false - system: true - - sudo - - audio -passwordRequirements: - nonempty: true - minLength: 0 - maxLength: 0 -# Explicitly set the shell instead of deferring to Calamares. We have a platform -# expectation derived from Ubuntu here. -user: - shell: /bin/bash - forbidden_names: [ root ] diff --git a/ubuntustudio/modules/welcome.conf b/ubuntustudio/modules/welcome.conf deleted file mode 100644 index 7318fdd..0000000 --- a/ubuntustudio/modules/welcome.conf +++ /dev/null @@ -1,25 +0,0 @@ ---- -showSupportUrl: true -showKnownIssuesUrl: true -showReleaseNotesUrl: true -#showDonateUrl: https://lubuntu.me/donate/ - -requirements: - requiredStorage: 16 - requiredRam: 2 - internetCheckUrl: https://ubuntustudio.org - - check: - - storage - - ram - - power - - internet - - root - required: - - root - - storage - - ram -geoip: - style: "xml" - url: "https://geoip.ubuntu.com/lookup" - selector: "CountryCode" diff --git a/ubuntustudio/po/Makefile b/ubuntustudio/po/Makefile deleted file mode 100755 index ae201bd..0000000 --- a/ubuntustudio/po/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/make -f - -POTFILES := $(shell cat POTFILES.in) - -all: generate-po-files - -generate-pot: POTFILES.in - intltool-update --pot --gettext-package=calamares-settings-ubuntustudio - -generate-po-files: - for i in $(POTFILES); do \ - f=$$(echo $$i | sed 's/\.in//'); \ - intltool-merge -d . ../$$i ../$$f; \ - done - -update-po: - for i in *.po; do \ - code=$$(echo $$i | sed 's/.po//'); \ - intltool-update --gettext-package=calamares-settings-ubuntustudio --dist $$code; \ - done - -# vim:ts=4 diff --git a/ubuntustudio/po/POTFILES.in b/ubuntustudio/po/POTFILES.in deleted file mode 100644 index 5aab4aa..0000000 --- a/ubuntustudio/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -ubuntustudio-calamares.desktop.in diff --git a/ubuntustudio/po/ar.po b/ubuntustudio/po/ar.po deleted file mode 100644 index 98e3e42..0000000 --- a/ubuntustudio/po/ar.po +++ /dev/null @@ -1,28 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-07-15 05:13+0000\n" -"Last-Translator: Simon Quigley \n" -"Language-Team: Arabic \n" -"Language: ar\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "تنصيب لوبينتو 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "تنصيب لوبينتو" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "الحبار — منصب النظام" diff --git a/ubuntustudio/po/be.po b/ubuntustudio/po/be.po deleted file mode 100644 index 0a75953..0000000 --- a/ubuntustudio/po/be.po +++ /dev/null @@ -1,25 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: be\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 2.3.0\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "" diff --git a/ubuntustudio/po/ca.po b/ubuntustudio/po/ca.po deleted file mode 100644 index 4e15d76..0000000 --- a/ubuntustudio/po/ca.po +++ /dev/null @@ -1,27 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-07-10 10:25+0000\n" -"Last-Translator: Simon Quigley \n" -"Language-Team: Catalan \n" -"Language: ca\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "Instal·lar Ubuntu Studio 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "Instal·lar Ubuntu Studio" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares — Instal·lador del Sistema" diff --git a/ubuntustudio/po/calamares-settings-lubuntu.pot b/ubuntustudio/po/calamares-settings-lubuntu.pot deleted file mode 100644 index 009aea2..0000000 --- a/ubuntustudio/po/calamares-settings-lubuntu.pot +++ /dev/null @@ -1,30 +0,0 @@ -# Base translation file for Ubuntu Studio's Calamares settings -# Copyright (C) 2018 Lubuntu Developers -# This file is distributed under the same license as the package. -# Simon Quigley , 2018. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../ubuntustudio-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "" - -#: ../ubuntustudio-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "" diff --git a/ubuntustudio/po/da.po b/ubuntustudio/po/da.po deleted file mode 100644 index 2cd4c41..0000000 --- a/ubuntustudio/po/da.po +++ /dev/null @@ -1,27 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-08-13 07:33+0000\n" -"Last-Translator: Henrik Christiansen \n" -"Language-Team: Danish \n" -"Language: da\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "Installer Ubuntu Studio 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "Installer Ubuntu Studio" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares - System installation" diff --git a/ubuntustudio/po/de.po b/ubuntustudio/po/de.po deleted file mode 100644 index d9f3b33..0000000 --- a/ubuntustudio/po/de.po +++ /dev/null @@ -1,27 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-07-10 12:59+0000\n" -"Last-Translator: Daniel Absmeier \n" -"Language-Team: German \n" -"Language: de\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "Ubuntu Studio 23.10 installieren" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "Ubuntu Studio installieren" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares — System Installer" diff --git a/ubuntustudio/po/el.po b/ubuntustudio/po/el.po deleted file mode 100644 index 75d5e85..0000000 --- a/ubuntustudio/po/el.po +++ /dev/null @@ -1,25 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: el\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 2.3.0\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "" diff --git a/ubuntustudio/po/es.po b/ubuntustudio/po/es.po deleted file mode 100644 index 7d89dff..0000000 --- a/ubuntustudio/po/es.po +++ /dev/null @@ -1,27 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-07-10 10:26+0000\n" -"Last-Translator: Simon Quigley \n" -"Language-Team: Spanish \n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "Instalar Ubuntu Studio 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "Instalar Ubuntu Studio" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares — Instalador del Sistema" diff --git a/ubuntustudio/po/et.po b/ubuntustudio/po/et.po deleted file mode 100644 index da30025..0000000 --- a/ubuntustudio/po/et.po +++ /dev/null @@ -1,25 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: et\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 2.3.0\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "" diff --git a/ubuntustudio/po/eu.po b/ubuntustudio/po/eu.po deleted file mode 100644 index d437c3b..0000000 --- a/ubuntustudio/po/eu.po +++ /dev/null @@ -1,25 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: eu\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 2.3.0\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "" diff --git a/ubuntustudio/po/fr.po b/ubuntustudio/po/fr.po deleted file mode 100644 index 93d5ac1..0000000 --- a/ubuntustudio/po/fr.po +++ /dev/null @@ -1,27 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-08-17 10:51+0000\n" -"Last-Translator: Carl Schwan \n" -"Language-Team: French \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "Installer Ubuntu Studio 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "Installer Ubuntu Studio" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares — Installateur de votre system" diff --git a/ubuntustudio/po/gl.po b/ubuntustudio/po/gl.po deleted file mode 100644 index 51ce605..0000000 --- a/ubuntustudio/po/gl.po +++ /dev/null @@ -1,25 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: gl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 2.3.0\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "" diff --git a/ubuntustudio/po/it.po b/ubuntustudio/po/it.po deleted file mode 100644 index f9a29f5..0000000 --- a/ubuntustudio/po/it.po +++ /dev/null @@ -1,32 +0,0 @@ -# Base translation file for Lubuntu's Calamares settings -# Copyright (C) 2018 Lubuntu Developers -# This file is distributed under the same license as the package. -# Simon Quigley , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-08-17 17:27+0000\n" -"Last-Translator: Emanuele Antonio Faraone \n" -"Language-Team: Italian \n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "Installa Ubuntu Studio 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "Installa Ubuntu Studio" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares — Installatore del Sistema" diff --git a/ubuntustudio/po/ko.po b/ubuntustudio/po/ko.po deleted file mode 100644 index 4076165..0000000 --- a/ubuntustudio/po/ko.po +++ /dev/null @@ -1,25 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: ko\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 2.3.0\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "" diff --git a/ubuntustudio/po/no.po b/ubuntustudio/po/no.po deleted file mode 100644 index acee23d..0000000 --- a/ubuntustudio/po/no.po +++ /dev/null @@ -1,27 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-07-25 07:41+0000\n" -"Last-Translator: Einar Mostad \n" -"Language-Team: Norwegian Bokmål \n" -"Language: no\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "Installer Ubuntu Studio 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Lubuntu" -msgstr "Installer Lubuntu" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares — System installerer" diff --git a/ubuntustudio/po/pl.po b/ubuntustudio/po/pl.po deleted file mode 100644 index c83226e..0000000 --- a/ubuntustudio/po/pl.po +++ /dev/null @@ -1,28 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-07-10 10:50+0000\n" -"Last-Translator: Marcin Mikołajczak \n" -"Language-Team: Polish \n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "Zainstaluj Ubuntu Studio 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "Zainstaluj Ubuntu Studio" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares — Instalator systemu" diff --git a/ubuntustudio/po/pt.po b/ubuntustudio/po/pt.po deleted file mode 100644 index bd11fc3..0000000 --- a/ubuntustudio/po/pt.po +++ /dev/null @@ -1,27 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-07-14 20:36+0000\n" -"Last-Translator: Luís Rafael Gomes \n" -"Language-Team: Portuguese \n" -"Language: pt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "Instalar o Ubuntu Studio 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "Instalar o Ubuntu Studio" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares — Instalador do Sistema" diff --git a/ubuntustudio/po/pt_BR.po b/ubuntustudio/po/pt_BR.po deleted file mode 100644 index 09a44be..0000000 --- a/ubuntustudio/po/pt_BR.po +++ /dev/null @@ -1,27 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: 2018-07-11 06:56+0000\n" -"Last-Translator: Lucas A. V. Dantas \n" -"Language-Team: Portuguese (Brazil) \n" -"Language: pt_BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.1-dev\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 23.10" -msgstr "Instalar Lubuntu 23.10" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "Instalar Ubuntu Studio" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "Calamares — Instalador do sistema" diff --git a/ubuntustudio/po/ru.po b/ubuntustudio/po/ru.po deleted file mode 100644 index 9d960ed..0000000 --- a/ubuntustudio/po/ru.po +++ /dev/null @@ -1,30 +0,0 @@ -# Base translation file for Lubuntu's Calamares settings -# Copyright (C) 2018 Lubuntu Developers -# This file is distributed under the same license as the package. -# Simon Quigley , 2018. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "" diff --git a/ubuntustudio/po/zh-hans.po b/ubuntustudio/po/zh-hans.po deleted file mode 100644 index 9d960ed..0000000 --- a/ubuntustudio/po/zh-hans.po +++ /dev/null @@ -1,30 +0,0 @@ -# Base translation file for Lubuntu's Calamares settings -# Copyright (C) 2018 Lubuntu Developers -# This file is distributed under the same license as the package. -# Simon Quigley , 2018. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 02:36-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Studio 23.10" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:2 -msgid "Install Ubuntu Studio" -msgstr "" - -#: ../lubuntu-calamares.desktop.in.h:3 -msgid "Calamares — System Installer" -msgstr "" diff --git a/ubuntustudio/settings.conf b/ubuntustudio/settings.conf deleted file mode 100644 index 92dea5b..0000000 --- a/ubuntustudio/settings.conf +++ /dev/null @@ -1,71 +0,0 @@ ---- -modules-search: [ local ] - -instances: -- id: before_bootloader_mkdirs - module: contextualprocess - config: before_bootloader_mkdirs_context.conf -- id: before_bootloader - module: contextualprocess - config: before_bootloader_context.conf -- id: after_bootloader - module: contextualprocess - config: after_bootloader_context.conf -- id: logs - module: shellprocess - config: shellprocess_logs.conf -- id: bug-LP#1829805 - module: shellprocess - config: shellprocess_bug-LP#1829805.conf -- id: add386arch - module: shellprocess - config: shellprocess_add386arch.conf -- id: fix_audio_perms - module: shellprocess - config: shellprocess_fix_audio_perms.conf - -sequence: -- show: - - welcome - - locale - - keyboard - - partition - - users - - summary -- exec: - - partition - - mount - - unpackfs - - machineid - - fstab - - locale - - keyboard - - localecfg - - luksbootkeyfile - - users - - displaymanager - - networkcfg - - hwclock - - contextualprocess@before_bootloader_mkdirs - - shellprocess@bug-LP#1829805 - - initramfscfg - - initramfs - - grubcfg - - shellprocess@fix_audio_perms - - contextualprocess@before_bootloader - - bootloader - - contextualprocess@after_bootloader - - automirror - - shellprocess@add386arch - - packages - - shellprocess@logs - - umount -- show: - - finished - -branding: ubuntustudio -prompt-install: true -dont-chroot: false -oem-setup: false -disable-cancel: false -disable-cancel-during-exec: false diff --git a/ubuntustudio/ubuntustudio-calamares.desktop.in b/ubuntustudio/ubuntustudio-calamares.desktop.in deleted file mode 100644 index e775712..0000000 --- a/ubuntustudio/ubuntustudio-calamares.desktop.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -_Name=Install Ubuntu Studio 23.10 -_GenericName=Install Ubuntu Studio -Exec=bash -c "export BROWSER='sudo -H -u ubuntu-studio firefox'; sudo -E calamares" -_Comment=Calamares — System Installer -Icon=calamares -Terminal=false -StartupNotify=true -Categories=Qt;System; -Keywords=installer;calamares;system;