[ci skip] update pkg

Nitrux · Jun 29, 2021 · d68f9f8 · d68f9f8
1 parent a201673
commit d68f9f8
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 313 deletions.
diff --git a/debian/calamares-settings-nitrux.install → debian/calamares-qml-settings-nitrux.install b/debian/calamares-settings-nitrux.install → debian/calamares-qml-settings-nitrux.install
@@ -1,3 +1,2 @@
-#lib/*
 etc/*
 usr/*
diff --git a/debian/calamares-settings-nitrux.qml-ignore → .../calamares-qml-settings-nitrux.qml-ignore b/debian/calamares-settings-nitrux.qml-ignore → .../calamares-qml-settings-nitrux.qml-ignore
diff --git a/debian/changelog b/debian/changelog
@@ -1,275 +1,5 @@
-calamares-settings-nitrux (1.1.54) nitrux; urgency=medium
+calamares-qml-settings-nitrux (0.1.9+0.1+new-dev) nitrux; urgency=medium
 
-  * Remove live user package from chroot.
+  * Create package.
 
- -- Uri Herrera <[email protected]>  Wed, 21 Mar 2021 06:10:00 -0500
-
-calamares-settings-nitrux (1.1.53) nitrux; urgency=medium
-
-  * Fix formatting in slideshow text.
-
- -- Uri Herrera <[email protected]>  Sat, 27 Mar 2021 17:33:00 -0500
-
-calamares-settings-nitrux (1.1.52) nitrux; urgency=medium
-
-  * Update slideshow text.
-
- -- Uri Herrera <[email protected]>  Sat, 27 Mar 2021 16:14:00 -0500
-
-calamares-settings-nitrux (1.1.51) nitrux; urgency=medium
-
-  * Use zstd compression in btrfs filesystem.
-
- -- Uri Herrera <[email protected]>  Wed, 24 Mar 2021 00:01:00 -0500
-
-calamares-settings-nitrux (1.1.50) nitrux; urgency=medium
-
-  * Comment module that may fail without internet, organize default groups of user.
-
- -- Uri Herrera <[email protected]>  Fri, 25 Feb 2021 00:27:00 -0500
-
-calamares-settings-nitrux (1.1.49) nitrux; urgency=medium
-
-  * Comment module that may fail without internet, organize default groups of user.
-
- -- Uri Herrera <[email protected]>  Sat, 31 Oct 2020 20:54:00 -0500
-
-calamares-settings-nitrux (1.1.48) nitrux; urgency=medium
-
-  * Use generic version number in the branding.
-
- -- Uri Herrera <[email protected]>  Mon, 07 Sep 2020 18:14:00 -0500
-
-calamares-settings-nitrux (1.1.47) nitrux; urgency=medium
-
-  * Fix typo in postrm script, use reboot instead of systemctl command to reboot, remove both calamares pkgs when finished.
-
- -- Uri Herrera <[email protected]>  Wed, 02 Sep 2020 20:23:00 -0500
-
-calamares-settings-nitrux (1.1.46) nitrux; urgency=medium
-
-  * Disable machineid module.
-
- -- Uri Herrera <[email protected]>  Wed, 02 Sep 2020 19:39:00 -0500
-
-calamares-settings-nitrux (1.1.45) nitrux; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Thu, 20 Aug 2020 21:46:00 -0500
-
-calamares-settings-nitrux (1.1.44) nitrux; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Sat, 27 Jun 2020 22:00:00 -0500
-
-calamares-settings-nitrux (1.1.43) nitrux; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Fri, 29 May 2020 16:38:00 -0500
-
-calamares-settings-nitrux (1.1.42) nitrux; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Fri, 29 May 2020 11:52:00 -0500
-
-calamares-settings-nitrux (1.1.41) nitrux; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Fri, 27 Mar 2020 18:05:00 -0500
-
-calamares-settings-nitrux (1.1.40) nitrux; urgency=medium
-
-  * Update version number in calamares configuration.
-
- -- Uri Herrera <[email protected]>  Fri, 27 Mar 2020 18:05:00 -0500
-
-calamares-settings-nitrux (1.1.39) nitrux; urgency=medium
-
-  * Update version number in calamares configuration.
-
- -- Uri Herrera <[email protected]>  Fri, 27 Mar 2020 16:33:00 -0500
-
-calamares-settings-nitrux (1.1.38) nitrux; urgency=medium
-
-  * Update version number.
-
- -- Uri Herrera <[email protected]>  Sat, 01 Feb 2020 21:07:00 -0500
-
-calamares-settings-nitrux (1.1.37) nxos; urgency=medium
-
-  * Adjust image with logos.
-
- -- Uri Herrera <[email protected]>  Sun, 19 Jan 2020 19:58:00 -0500
-
-calamares-settings-nitrux (1.1.37) nxos; urgency=medium
-
-  * Remove version from desktop launcher.
-
- -- Uri Herrera <[email protected]>  Sun, 19 Jan 2020 18:59:00 -0500
-
-calamares-settings-nitrux (1.1.36) nxos; urgency=medium
-
-  * Adjust spacing copyright image.
-
- -- Uri Herrera <[email protected]>  Sun, 19 Jan 2020 17:37:00 -0500
-
-calamares-settings-nitrux (1.1.35) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Sun, 19 Jan 2020 07:21:00 -0500
-
-calamares-settings-nitrux (1.1.34) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Sun, 19 Jan 2020 07:09:00 -0500
-
-calamares-settings-nitrux (1.1.33) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Sun, 19 Jan 2020 06:48:00 -0500
-
-calamares-settings-nitrux (1.1.32) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Sun, 19 Jan 2020 05:47:00 -0500
-
-calamares-settings-nitrux (1.1.31) nxos; urgency=medium
-
-  * Remove version number from desktop icon.
-
- -- Uri Herrera <[email protected]>  Sat, 04 Jan 2020 19:58:00 -0500
-
-calamares-settings-nitrux (1.1.30) nxos; urgency=medium
-
-  * Set default shell to zsh.
-
- -- Uri Herrera <[email protected]>  Mon, 16 Dec 2019 21:10:00 -0500
-
-calamares-settings-nitrux (1.1.29) nxos; urgency=medium
-
-  * Remove log helper.
-
- -- Uri Herrera <[email protected]>  Mon, 16 Dec 2019 14:52:00 -0500
-
-calamares-settings-nitrux (1.1.28) nxos; urgency=medium
-
-  * A typo.
-
- -- Uri Herrera <[email protected]>  Mon, 16 Dec 2019 03:16:00 -0500
-
-calamares-settings-nitrux (1.1.27) nxos; urgency=medium
-
-  * Whatever.
-
- -- Uri Herrera <[email protected]>  Mon, 16 Dec 2019 02:51:00 -0500
-
-calamares-settings-nitrux (1.1.27) nxos; urgency=medium
-
-  * Whatever.
-
- -- Uri Herrera <[email protected]>  Mon, 16 Dec 2019 02:46:00 -0500
-
-calamares-settings-nitrux (1.1.26) nxos; urgency=medium
-
-  * Remove unnecessary modules.
-
- -- Uri Herrera <[email protected]>  Mon, 16 Dec 2019 02:32:00 -0500
-
-calamares-settings-nitrux (1.1.26) nxos; urgency=medium
-
-  * Make helper script not Lubuntu specific.
-
- -- Uri Herrera <[email protected]>  Mon, 16 Dec 2019 01:57:00 -0500
-
-calamares-settings-nitrux (1.1.25) nxos; urgency=medium
-
-  * Make helper script not Lubuntu specific.
-
- -- Uri Herrera <[email protected]>  Mon, 16 Dec 2019 00:08:00 -0500
-
-calamares-settings-nitrux (1.1.24) nxos; urgency=medium
-
-  * Make helper script not Lubuntu specific.
-
- -- Uri Herrera <[email protected]>  Sun, 15 Dec 2019 23:25:00 -0500
-
-calamares-settings-nitrux (1.1.23) nxos; urgency=medium
-
-  * Add more modules.
-
- -- Uri Herrera <[email protected]>  Sun, 15 Dec 2019 22:54:00 -0500
-
-calamares-settings-nitrux (1.1.22) nxos; urgency=medium
-
-  * Add initramfs.conf, change defualtDesktopEnvironment.
-
- -- Uri Herrera <[email protected]>  Sun, 15 Dec 2019 22:36:00 -0500
-
-calamares-settings-nitrux (1.1.21) nxos; urgency=medium
-
-  * Set machineid.conf values to false.
-
- -- Uri Herrera <[email protected]>  Sun, 15 Dec 2019 07:39:00 -0500
-
-calamares-settings-nitrux (1.1.20) nxos; urgency=medium
-
-  * Set machineid.conf values to false.
-
- -- Uri Herrera <[email protected]>  Sun, 15 Dec 2019 07:24:00 -0500
-
-calamares-settings-nitrux (1.1.19) nxos; urgency=medium
-
-  * Don't remove calamares-settings-nitrux.
-
- -- Uri Herrera <[email protected]>  Sat, 14 Dec 2019 17:01:00 -0500
-
-calamares-settings-nitrux (1.1.18) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Sat, 14 Dec 2019 16:12:00 -0500
-
-calamares-settings-nitrux (1.1.17) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Tue, 10 Dec 2019 18:23:00 -0500
-
-calamares-settings-nitrux (1.1.16) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Thu, 05 Dec 2019 01:45:00 -0500
-
-calamares-settings-nitrux (1.1.15) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Wed, 04 Dec 2019 18:34:00 -0500
-
-calamares-settings-nitrux (1.1.13) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Fri, 31 Aug 2018 12:09:00 -0500
-
-calamares-settings-nitrux (1.1.12) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Sun, 27 Jul 2018 21:06:00 -0500
-
-calamares-settings-nitrux (1.1.11) nxos; urgency=medium
-
-  * Update package.
-
- -- Uri Herrera <[email protected]>  Sun, 22 Jul 2018 15:23:00 -0500
+ -- Uri Herrera <[email protected]>  Tue, 29 Jul 2021 01:17:00 -0500
diff --git a/debian/control b/debian/control
@@ -1,15 +1,15 @@
-Source: calamares-settings-nitrux
-Section: unknown
+Source: calamares-qml-settings-nitrux
+Section: kde
 Priority: optional
-Maintainer: Alexis López Zubieta <azubieta90@gmail.com>
+Maintainer: Camilo Higuita <milo.h@aol.com>
 Build-Depends: debhelper (>=9)
 Standards-Version: 3.9.6
 Homepage: https://nxos.org/
 Vcs-Git: https://github.com/Nitrux/calamares-settings-nitrux.git
 
-Package: calamares-settings-nitrux
+Package: calamares-qml-settings-nitrux
 Architecture: any
 Replaces: calamares-settings-nxos
-Depends: ${shlibs:Depends}, ${misc:Depends}, calamares
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
+Depends: ${shlibs:Depends}, ${misc:Depends}, calamares-qml
+Description: Settings for Calamares QMl.
+ Nitrux branding package and settings for the Calamares QML installer.
diff --git a/debian/copyright b/debian/copyright
@@ -1,24 +1,19 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: calamares-settings-nitrux
-Source: <url://example.com>
+Upstream-Name: calamares-qml-settings-nitrux
+Source: https://github.com/Nitrux/calamares-qml-settings-nitrux.git
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+Copyright: 2020 Camilo Higuita <[email protected]>
+License: GPL-3.0+
 
-# 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: 2017 Alexis L?pez Zubieta <[email protected]>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
+Copyright: 2020 Camilo Higuita <[email protected]>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ This program 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; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
  .
  This package is distributed in the hope that it will be useful,
@@ -27,12 +22,7 @@ License: GPL-2+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
  .
  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 picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/etc/calamares/branding/nxos/ResponsiveBase.qml b/etc/calamares/branding/nxos/ResponsiveBase.qml
@@ -46,7 +46,7 @@ Page
                 smooth: false
                 asynchronous: true
                 cache: true
-                source: "./nomad.png"
+                source: "./calamares_bg_image.png"
             }
 
             FastBlur

diff --git a/etc/calamares/branding/nxos/branding.desc b/etc/calamares/branding/nxos/branding.desc
@@ -15,10 +15,10 @@ welcomeExpandingLogo:   true
 strings:
     productName:         Nitrux OS
     shortProductName:    Nitrux
-    version:             1.3.x
-    shortVersion:        1.3.x
-    versionedName:       Nitrux OS 1.3.x build.0x0
-    shortVersionedName:  Nitrux 1.3.x build.0x0
+    version:             1.5.x
+    shortVersion:        1.5.x
+    versionedName:       Nitrux OS 1.5.x build.0x0
+    shortVersionedName:  Nitrux 1.5.x build.0x0
     bootloaderEntryName: Nitrux
     productUrl:          https://nxos.org/
     supportUrl:          https://nxos.org/
@@ -29,7 +29,6 @@ images:
     productLogo:         "calamares_product_logo.svg"
     productIcon:         "calamares_product_icon.svg"
     productWelcome:      "calamares_welcome_logo.svg"
- #  productWallpaper:    "calamares_wallpaper.jpg"
 
 slideshow:               "show.qml"
 
@@ -47,6 +46,4 @@ style:
    sidebarTextSelect:    "#FFFFFF"
    sidebarTextHighlight: "#26C6DA"
 
-windowExpanding:	 fullscreen
-sidebar:               none
-#navigation: 	none
+sidebar:                none
diff --git a/etc/calamares/branding/nxos/nomad.png → ...ares/branding/nxos/calamares_bg_image.png b/etc/calamares/branding/nxos/nomad.png → ...ares/branding/nxos/calamares_bg_image.png
diff --git a/etc/calamares/branding/nxos/calamares_wallpaper.jpg b/etc/calamares/branding/nxos/calamares_wallpaper.jpg
-Original file line number
+Diff line change
@@ -1,3 +1,2 @@
-    #lib/*
     etc/*
     usr/*