diff --git a/debian/calamares-settings.install b/debian/calamares-settings.install index 179cfec..c5b3ffc 100644 --- a/debian/calamares-settings.install +++ b/debian/calamares-settings.install @@ -1,3 +1 @@ -#lib/* etc/* -usr/* diff --git a/debian/changelog b/debian/changelog index 8bc4d47..956644b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -calamares-settings (0) UNRELEASED; urgency=low +calamares-settings (0~ppa7.2) bionic; urgency=high + [ Jonathan Riddell ] * Initial release - -- Jonathan Riddell Tue, 17 Jan 2017 13:55:46 +0000 + -- Simon Quigley Fri, 17 Nov 2017 14:26:04 -0600 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 2d48d6c..5d4dfa3 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,16 @@ -Source: calamares-settings +Source: calamares-settings-ubuntu Section: devel Priority: optional -Maintainer: Rohan Garg -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.6 +Maintainer: Simon Quigley +Build-Depends: debhelper (>= 10) +Standards-Version: 4.1.1 Homepage: https://github.com/netrunner-core/calamares-core -Vcs-Git: git://anongit.neon.kde.org/neon/calamares-settings -Vcs-Browser: https://packaging.neon.kde.org/neon/calamares-settings +Vcs-Git: https://git.launchpad.net/~lubuntu-next/+git/calamares-settings-ubuntu +Vcs-Browser: https://git.launchpad.net/~lubuntu-next/+git/calamares-settings-ubuntu -Package: calamares-settings -Architecture: amd64 +Package: calamares-settings-lubuntu +Architecture: all +Suggests: lubuntu-qt-desktop Depends: calamares -Description: distribution-independent installer framework - distribution-independent installer framework. - . - This package contains the calamares settings and branding for KDE neon. +Description: Lubuntu Next Calamares Settings and Branding + This package contains the calamares settings and branding for Lubuntu Next. diff --git a/debian/copyright b/debian/copyright index 8475b16..3f2adff 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,20 +1,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: calamares -Source: Files: * -Copyright: - -License: - - - . - - -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines -Files: debian/* Copyright: 2014 Rohan Garg + 2017 Simon Quigley License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,8 +19,3 @@ License: GPL-2+ . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/debian/rules b/debian/rules index ce2eb52..2d33f6a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --parallel + dh $@ diff --git a/etc/calamares/branding/lubuntu/branding.desc b/etc/calamares/branding/lubuntu/branding.desc new file mode 100644 index 0000000..851b72b --- /dev/null +++ b/etc/calamares/branding/lubuntu/branding.desc @@ -0,0 +1,27 @@ +--- +componentName: lubuntu + +strings: + productName: Lubuntu Next + shortProductName: Lubuntu Next + version: 18.04 + shortVersion: bionic + versionedName: Lubuntu Bionic Beaver + shortVersionedName: Lubuntu Next 18.04 + bootloaderEntryName: Lubuntu Next 18.04 + productUrl: http://lubuntu.me/ + supportUrl: http://lubuntu.me/support/ + knownIssuesUrl: https://wiki.ubuntu.com/BionicBeaver/Alpha1/LubuntuNext#Known_Problems + releaseNotesUrl: https://wiki.ubuntu.com/BionicBeaver/Alpha1/LubuntuNext + +images: + productLogo: "logo.png" + productIcon: "logo.png" + productWelcome: "welcome.png" + +slideshow: "show.qml" + +style: + sidebarBackground: "#033C71" + sidebarText: "#FFFFFF" + sidebarTextSelect: "#0068C8" diff --git a/etc/calamares/branding/lubuntu/logo.png b/etc/calamares/branding/lubuntu/logo.png new file mode 100644 index 0000000..b9ce65a Binary files /dev/null and b/etc/calamares/branding/lubuntu/logo.png differ diff --git a/etc/calamares/branding/neon/show.qml b/etc/calamares/branding/lubuntu/show.qml similarity index 99% rename from etc/calamares/branding/neon/show.qml rename to etc/calamares/branding/lubuntu/show.qml index 1316858..3e3d7ca 100644 --- a/etc/calamares/branding/neon/show.qml +++ b/etc/calamares/branding/lubuntu/show.qml @@ -34,7 +34,6 @@ Presentation repeat: true onTriggered: presentation.goToNextSlide() } - Slide { Image { diff --git a/etc/calamares/branding/neon/slide1.png b/etc/calamares/branding/lubuntu/slide1.png similarity index 100% rename from etc/calamares/branding/neon/slide1.png rename to etc/calamares/branding/lubuntu/slide1.png diff --git a/etc/calamares/branding/lubuntu/welcome.png b/etc/calamares/branding/lubuntu/welcome.png new file mode 100644 index 0000000..319a599 Binary files /dev/null and b/etc/calamares/branding/lubuntu/welcome.png differ diff --git a/etc/calamares/branding/neon/branding.desc b/etc/calamares/branding/neon/branding.desc deleted file mode 100644 index 2fba3c0..0000000 --- a/etc/calamares/branding/neon/branding.desc +++ /dev/null @@ -1,23 +0,0 @@ ---- -componentName: neon - -strings: - productName: KDE neon - shortProductName: neon - version: Developer Edition (Unstable Branches) - shortVersion: devunstable - versionedName: KDE neon - shortVersionedName: KDE neon devunstable - bootloaderEntryName: KDE neon Developer Edition (Unstable Branches) - -images: - productLogo: "kdeneon.png" - productIcon: "kdeneon.png" - productWelcome: "welcome.png" - -slideshow: "show.qml" - -style: - sidebarBackground: "#474747" - sidebarText: "#FFFFFF" - sidebarTextSelect: "#444444" diff --git a/etc/calamares/branding/neon/branding.desc~ b/etc/calamares/branding/neon/branding.desc~ deleted file mode 100644 index 4d98f94..0000000 --- a/etc/calamares/branding/neon/branding.desc~ +++ /dev/null @@ -1,23 +0,0 @@ ---- -componentName: netrunner-core - -strings: - productName: Netrunner Core - shortProductName: Core - version: 1.0.0-dev - shortVersion: 1.0 - versionedName: Netrunner Core - shortVersionedName: Netrunner Core 1.0 - bootloaderEntryName: Netrunner Core - -images: - productLogo: "netrunner-core-logo.png" - productIcon: "netrunner-core-icon.png" - productWelcome: "welcome.png" - -slideshow: "show.qml" - -style: - sidebarBackground: "#0C0C0C" - sidebarText: "#5A5A5A" - sidebarTextSelect: "#FFFFFF" diff --git a/etc/calamares/branding/neon/kdeneon.png b/etc/calamares/branding/neon/kdeneon.png deleted file mode 100644 index c1e2e10..0000000 Binary files a/etc/calamares/branding/neon/kdeneon.png and /dev/null differ diff --git a/etc/calamares/branding/neon/welcome.png b/etc/calamares/branding/neon/welcome.png deleted file mode 100644 index a64cd09..0000000 Binary files a/etc/calamares/branding/neon/welcome.png and /dev/null differ diff --git a/etc/calamares/modules/netinstall.conf b/etc/calamares/modules/netinstall.conf deleted file mode 100644 index 3264295..0000000 --- a/etc/calamares/modules/netinstall.conf +++ /dev/null @@ -1,2 +0,0 @@ ---- -groupsUrl: file:///usr/share/calamares/netinstall.php diff --git a/etc/calamares/modules/packages.conf b/etc/calamares/modules/packages.conf index 870be77..25ea3c1 100644 --- a/etc/calamares/modules/packages.conf +++ b/etc/calamares/modules/packages.conf @@ -4,3 +4,4 @@ operations: - remove: - calamares - '^live-*' + - memtest86+ diff --git a/etc/calamares/settings.conf b/etc/calamares/settings.conf index e17e6ec..52deebf 100644 --- a/etc/calamares/settings.conf +++ b/etc/calamares/settings.conf @@ -2,39 +2,33 @@ modules-search: [ local ] sequence: +- show: + - welcome + - locale + - keyboard + - partition + - users + - summary +- exec: + - partition + - mount + - unpackfs + - machineid + - fstab + - locale + - keyboard + - localecfg + - users + - networkcfg + - hwclock + - services + - grubcfg + - bootloader + - packages + - initcpio + - umount +- show: + - finished - - show: - - welcome - - locale - - keyboard - - partition - - users - - summary - - - exec: - - partition - - mount - - unpackfs - - machineid - - fstab - - locale - - keyboard - - localecfg - - users - - displaymanager - - networkcfg - - hwclock - - services - # Add initramfs module for Debian - - initramfs - - grubcfg - - bootloader - - packages - - umount - - - show: - - finished - - -branding: neon -prompt-install: false +branding: lubuntu +prompt-install: true diff --git a/usr/share/calamares/netinstall.php b/usr/share/calamares/netinstall.php deleted file mode 100644 index d955dcc..0000000 --- a/usr/share/calamares/netinstall.php +++ /dev/null @@ -1,14 +0,0 @@ -- name: "Restricted Media Formats" - description: "Media tools with restricted uses" - packages: - - flashplugin-installer - - gstreamer1.0-plugins-ugly - - gstreamer1.0-plugins-bad - - gstreamer1.0-libav - - libk3b6-extracodecs - - libdvdread4 - - chromium-codecs-ffmpeg-extra - - oxideqt-codecs-extra - - unrar - - lame - - libavcodec-extra