diff --git a/packages/calamares-settings-hamara/calamares/bootloader-eficonfig/module.desc b/packages/calamares-settings-hamara/calamares-modules/bootloader-eficonfig/module.desc similarity index 100% rename from packages/calamares-settings-hamara/calamares/bootloader-eficonfig/module.desc rename to packages/calamares-settings-hamara/calamares-modules/bootloader-eficonfig/module.desc diff --git a/packages/calamares-settings-hamara/calamares/sources-final/module.desc b/packages/calamares-settings-hamara/calamares-modules/sources-final/module.desc similarity index 87% rename from packages/calamares-settings-hamara/calamares/sources-final/module.desc rename to packages/calamares-settings-hamara/calamares-modules/sources-final/module.desc index cff6b2f4123292de67ebfa1df972050be8bcbc5c..4ff75eba6b7db56616206807a15436de4af91e6e 100644 --- a/packages/calamares-settings-hamara/calamares/sources-final/module.desc +++ b/packages/calamares-settings-hamara/calamares-modules/sources-final/module.desc @@ -3,3 +3,4 @@ type: "job" name: "sources-final" interface: "process" command: "/usr/sbin/sources-final" +timeout: 600 diff --git a/packages/calamares-settings-hamara/calamares/sources-installtime/module.desc b/packages/calamares-settings-hamara/calamares-modules/sources-installtime/module.desc similarity index 100% rename from packages/calamares-settings-hamara/calamares/sources-installtime/module.desc rename to packages/calamares-settings-hamara/calamares-modules/sources-installtime/module.desc diff --git a/packages/calamares-settings-hamara/calamares/unmount-media-chroot/module.desc b/packages/calamares-settings-hamara/calamares-modules/unmount-media-chroot/module.desc similarity index 100% rename from packages/calamares-settings-hamara/calamares/unmount-media-chroot/module.desc rename to packages/calamares-settings-hamara/calamares-modules/unmount-media-chroot/module.desc diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc b/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc index 25073d4a653e50725137af4d5ec915487d77c180..90e41ce2e3fddb24bf6140e2ca23ca5f103cb91c 100644 --- a/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc +++ b/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc @@ -1,13 +1,14 @@ --- componentName: hamara +welcomeStyleCalamares: false strings: productName: Hamara Linux shortProductName: Hamara Linux version: 2 shortVersion: 2 - versionedName: Hamara Sugam 2.0 - shortVersionedName: Hamara Sugam 2.0 + versionedName: Hamara Sugam 2.0 + shortVersionedName: Hamara Sugam 2.0 bootloaderEntryName: Hamara Linux productUrl: https://hamaralinux.org supportUrl: https://forum.hamaralinux.org/ diff --git a/packages/calamares-settings-hamara/calamares/modules/welcome.conf b/packages/calamares-settings-hamara/calamares/modules/welcome.conf index 286ef837f21bd71288fd8a19f2d5dd59f4b97565..1e2046a4e4464ee495dcddb7eb8fd9c63cdc263a 100644 --- a/packages/calamares-settings-hamara/calamares/modules/welcome.conf +++ b/packages/calamares-settings-hamara/calamares/modules/welcome.conf @@ -13,7 +13,7 @@ requirements: - power - internet - root - - screen + - screen required: - storage - ram diff --git a/packages/calamares-settings-hamara/calamares/mount-media-chroot/module.desc b/packages/calamares-settings-hamara/calamares/mount-media-chroot/module.desc deleted file mode 100644 index 900d0aab0e6367844a631d5fb38d5c02f9c6eba4..0000000000000000000000000000000000000000 --- a/packages/calamares-settings-hamara/calamares/mount-media-chroot/module.desc +++ /dev/null @@ -1,6 +0,0 @@ ---- -type: "job" -name: "mount-media-chroot" -interface: "process" -command: "/usr/sbin/mount-media-chroot" -chroot: false diff --git a/packages/calamares-settings-hamara/calamares/settings.conf b/packages/calamares-settings-hamara/calamares/settings.conf index b3cc5fd76e206872ac5b4aaf595cbbf376702dd1..ed274077c8d2225538c2bf9a6001b166432767a3 100644 --- a/packages/calamares-settings-hamara/calamares/settings.conf +++ b/packages/calamares-settings-hamara/calamares/settings.conf @@ -3,7 +3,7 @@ --- # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules -modules-search: [ local ] +modules-search: [ local, /usr/lib/calamares/modules ] sequence: @@ -29,7 +29,7 @@ sequence: - partition - mount - unpackfs - - mount-media-chroot + - mount - sources-installtime - machineid - fstab @@ -43,7 +43,6 @@ sequence: - services - grubcfg - bootloader - - unmount-media-chroot - sources-final - packages - initramfs diff --git a/packages/calamares-settings-hamara/debian/changelog b/packages/calamares-settings-hamara/debian/changelog index 8b069621be55bf5ffd2318c768bc19626d8c2d53..22cbafcab4a51aa533ce6f52758c44273447eff9 100644 --- a/packages/calamares-settings-hamara/debian/changelog +++ b/packages/calamares-settings-hamara/debian/changelog @@ -1,3 +1,10 @@ +calamares-settings-hamara (201806) namaste; urgency=medium + + * Newer package following the changes in upstream + * paths for multiple modules have changed + + -- Raju Devidas Vindane Tue, 05 Jun 2018 16:59:02 +0530 + calamares-settings-hamara (201710) namaste; urgency=medium * Updates to the repo URLs in package to point to buster security repos diff --git a/packages/calamares-settings-hamara/debian/control b/packages/calamares-settings-hamara/debian/control index 3713aecfe0210b4e8df280d258d5310f34ec3cce..ad6388ecff923e759cbfd4a11166b25eaa367e8a 100644 --- a/packages/calamares-settings-hamara/debian/control +++ b/packages/calamares-settings-hamara/debian/control @@ -3,12 +3,14 @@ Section: utils Priority: optional Maintainer: Raju Devidas Build-Depends: debhelper (>=10) -Standards-Version: 4.1.3 +Standards-Version: 4.1.4 Homepage: https://hamaralinux.org Package: calamares-settings-hamara Architecture: all Depends: calamares, + cryptsetup, + keyutils, qml-module-qtquick-window2, qml-module-qtquick2, ${misc:Depends}, @@ -17,4 +19,4 @@ Description: Configuration for Calamares installer on Hamara Linux This package is intended for use along with calamares installer on a Hamara Linux live desktop. . This is used on live CD and USB images and is not intended for - installation on normal systems. \ No newline at end of file + installation on normal systems. diff --git a/packages/calamares-settings-hamara/debian/copyright b/packages/calamares-settings-hamara/debian/copyright index 991fc7e24ea7dc5dcd2a5e111318784a3e905ce8..2c63dcf313bb26fee3033c9ea128a927f34d1edc 100644 --- a/packages/calamares-settings-hamara/debian/copyright +++ b/packages/calamares-settings-hamara/debian/copyright @@ -1,9 +1,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: calamares-settings-hamara -Source: https://git.hamaralinux.org/libregeekingkid/calamares-settings-hamara +Source: https://git.hamaralinux.org/hamara-developers/hamara-packages/tree/hamara-sugam/packages/calamares-settings-hamara Files: * -Copyright (C) 2017 Raju Devidas +Copyright (C) 2018 Raju Devidas 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 diff --git a/packages/calamares-settings-hamara/debian/install b/packages/calamares-settings-hamara/debian/install index f8528c045ca40da8c060c59b62e7503ed0536b81..5746b8fdb87cab99c5a140d4f7c69eaf7f131ce4 100644 --- a/packages/calamares-settings-hamara/debian/install +++ b/packages/calamares-settings-hamara/debian/install @@ -1,13 +1,5 @@ -artwork/install-hamara-linux.png usr/share/pixmaps -calamares etc/ -calamares/bootloader-eficonfig usr/lib/calamares/modules -calamares/mount-media-chroot usr/lib/calamares/modules -calamares/scripts/bootloader-eficonfig usr/sbin -calamares/scripts/mount-media-chroot usr/sbin -calamares/scripts/sources-final usr/sbin -calamares/scripts/sources-installtime usr/sbin -calamares/scripts/unmount-media-chroot usr/sbin -calamares/sources-final usr/lib/calamares/modules -calamares/sources-installtime usr/lib/calamares/modules -calamares/unmount-media-chroot usr/lib/calamares/modules +calamares etc +calamares-modules/* usr/lib/calamares/modules +scripts/* usr/sbin install-hamara-desktop.desktop usr/share/applications +artwork/install-hamara-linux.png usr/share/pixmaps diff --git a/packages/calamares-settings-hamara/install-hamara-desktop.desktop b/packages/calamares-settings-hamara/install-hamara-desktop.desktop index 7e6515e9955a880c80d21f0f1e1a8f4e945ef5c3..ef2c24f02f752a625bcfa3034ca2e0d01486ed10 100644 --- a/packages/calamares-settings-hamara/install-hamara-desktop.desktop +++ b/packages/calamares-settings-hamara/install-hamara-desktop.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Install Hamara Sugam +Name=Install Hamara Sugam GenericName=System Installer Exec=sudo /usr/bin/calamares Comment=Calamares— Hamara Sugam Desktop Installer diff --git a/packages/calamares-settings-hamara/calamares/scripts/bootloader-eficonfig b/packages/calamares-settings-hamara/scripts/bootloader-eficonfig similarity index 100% rename from packages/calamares-settings-hamara/calamares/scripts/bootloader-eficonfig rename to packages/calamares-settings-hamara/scripts/bootloader-eficonfig diff --git a/packages/calamares-settings-hamara/calamares/scripts/mount-media-chroot b/packages/calamares-settings-hamara/scripts/mount-media-chroot similarity index 100% rename from packages/calamares-settings-hamara/calamares/scripts/mount-media-chroot rename to packages/calamares-settings-hamara/scripts/mount-media-chroot diff --git a/packages/calamares-settings-hamara/calamares/scripts/sources-final b/packages/calamares-settings-hamara/scripts/sources-final similarity index 98% rename from packages/calamares-settings-hamara/calamares/scripts/sources-final rename to packages/calamares-settings-hamara/scripts/sources-final index 4c00e91e5da6b73c99ca6b57a2db684169702d69..72ca615730f2543670d973e1d76d5fc5111cacd2 100755 --- a/packages/calamares-settings-hamara/calamares/scripts/sources-final +++ b/packages/calamares-settings-hamara/scripts/sources-final @@ -10,3 +10,5 @@ deb-src http://in.devel.hamaralinux.org/hamara-sugam namaste main contrib non-fr deb http://security.debian.org/debian-security testing/updates main deb-src http://security.debian.org/debian-security testing/updates main EOF + +exit 0 diff --git a/packages/calamares-settings-hamara/calamares/scripts/sources-installtime b/packages/calamares-settings-hamara/scripts/sources-installtime similarity index 100% rename from packages/calamares-settings-hamara/calamares/scripts/sources-installtime rename to packages/calamares-settings-hamara/scripts/sources-installtime diff --git a/packages/calamares-settings-hamara/calamares/scripts/unmount-media-chroot b/packages/calamares-settings-hamara/scripts/unmount-media-chroot similarity index 100% rename from packages/calamares-settings-hamara/calamares/scripts/unmount-media-chroot rename to packages/calamares-settings-hamara/scripts/unmount-media-chroot diff --git a/packages/hamara-sugam-config/Hamara.info b/packages/hamara-sugam-config/Hamara.info new file mode 100644 index 0000000000000000000000000000000000000000..32c7aabb90f632817f2d4a6fabf879dfe95d6e18 --- /dev/null +++ b/packages/hamara-sugam-config/Hamara.info @@ -0,0 +1,12 @@ +Suite: namaste +RepositoryType: deb +BaseURI: http://in.devel.hamaralinux.org/hamara-sugam +MatchURI: in.devel.hamaralinux.org/hamara-sugam +MirrorsFile: Hamara.mirrors +Description: Hamara GNU/Linux +Component: main +CompDescription: Officially supported +Component: contrib +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +CompDescription: Non-DFSG-compatible Software \ No newline at end of file diff --git a/packages/hamara-sugam-config/Hamara.mirrors b/packages/hamara-sugam-config/Hamara.mirrors new file mode 100644 index 0000000000000000000000000000000000000000..be7607ad05c81ef99684914575c241624e52ef16 --- /dev/null +++ b/packages/hamara-sugam-config/Hamara.mirrors @@ -0,0 +1 @@ +http://in.devel.hamaralinux.org/hamara-sugam diff --git a/packages/hamara-sugam-config/debian/changelog b/packages/hamara-sugam-config/debian/changelog index 7d3c8cd1148b5c44ed5b6c10d0fe591bf1ac0ad8..40cecf6c580de70532b5b2395ee32029f121ebd0 100644 --- a/packages/hamara-sugam-config/debian/changelog +++ b/packages/hamara-sugam-config/debian/changelog @@ -1,3 +1,9 @@ +hamara-sugam-config (1.1) namaste; urgency=medium + + * Adding support for software-properties-gtk configuration + + -- Raju Devidas Wed, 13 Jun 2018 21:25:46 +0530 + hamara-sugam-config (1.0) namaste; urgency=medium * Initial release (Closes: #nnnn) diff --git a/packages/hamara-sugam-config/debian/compat b/packages/hamara-sugam-config/debian/compat index ec635144f60048986bc560c5576355344005e6e7..f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 100644 --- a/packages/hamara-sugam-config/debian/compat +++ b/packages/hamara-sugam-config/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/packages/hamara-sugam-config/debian/control b/packages/hamara-sugam-config/debian/control index 862d82d720c428dbe6f2e598ceaa78fb88ac9b31..43543e46eb258d59d5db8697e6c2e7226dab3d3e 100644 --- a/packages/hamara-sugam-config/debian/control +++ b/packages/hamara-sugam-config/debian/control @@ -2,8 +2,8 @@ Source: hamara-sugam-config Section: hamara Priority: optional Maintainer: Sagar Ippalpalli -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 10) +Standards-Version: 4.1.4 Homepage: https://git.hamaralinux.org/hamara-developers/hamara-packages Package: hamara-sugam-config diff --git a/packages/hamara-sugam-config/debian/install b/packages/hamara-sugam-config/debian/install index 6b3c82565b748a204ff45215d95bb509e086ee1c..95cc05081e688ddd5e4737b679a88556888e3ad6 100644 --- a/packages/hamara-sugam-config/debian/install +++ b/packages/hamara-sugam-config/debian/install @@ -1 +1,5 @@ sources.list /etc/apt +Hamara.info /usr/share/python-apt/templates +Hamara.mirrors /usr/share/python-apt/templates +hamara.csv /usr/share/distro-info +lsb-release /etc \ No newline at end of file diff --git a/packages/hamara-sugam-config/hamara.csv b/packages/hamara-sugam-config/hamara.csv new file mode 100644 index 0000000000000000000000000000000000000000..b14053adbed91b3d8808c4f5f3add92250464eb2 --- /dev/null +++ b/packages/hamara-sugam-config/hamara.csv @@ -0,0 +1,2 @@ +version,codename,series,created,release,eol +2.0,Namaste,namaste,2018-06-05,2018-07-24,2021-06-09 \ No newline at end of file diff --git a/packages/hamara-sugam-config/lsb-release b/packages/hamara-sugam-config/lsb-release new file mode 100644 index 0000000000000000000000000000000000000000..04e931fcb4b35f4a753c2a8052c2af04ef91cb8b --- /dev/null +++ b/packages/hamara-sugam-config/lsb-release @@ -0,0 +1,4 @@ +DISTRIB_ID=Hamara +DISTRIB_RELEASE=2.0 +DISTRIB_CODENAME=namaste +DISTRIB_DESCRIPTION="Hamara GNU/Linux" \ No newline at end of file