Various fixes

2017.1/aims-live-2017/calamares/branding/aimsdesktop/branding.desc

@@ -4,10 +4,10 @@ componentName:   aimsdesktop
 strings:
     productName:         AIMS Desktop
     shortProductName:    AIMS Desktop
-    version:             2017.1
-    shortVersion:        2017.1
-    versionedName:       AIMS Desktop 2017.1
-    shortVersionedName:  AIMS Desktop 2017.1
+    version:             2018.1
+    shortVersion:        2018.1
+    versionedName:       AIMS Desktop 2018.1
+    shortVersionedName:  AIMS Desktop 2018.1
     bootloaderEntryName: AIMS Desktop
     productUrl:          https://aims.ac.za
     supportUrl:          https://help.aims.ac.za

2017.1/aims-live-2017/calamares/enable-locales/module.desc

 ---
 type:       "job"
-name:       "sources-final"
+name:       "enable-locales"
 interface:  "process"
 command:    "/usr/sbin/enable-locales"

2017.1/aims-live-2017/calamares/settings.conf

@@ -47,16 +47,14 @@ sequence:
   - networkcfg
   - hwclock
   - services
-  - luksbootkeyfile
-  - luksopenswaphookcfg
-  - grubcfg
-  - bootloader
   - unmount-media-chroot
   - sources-final
   - packages
   - luksbootkeyfile
   - luksopenswaphookcfg
   - initramfs
+  - grubcfg
+  - bootloader
   - umount
 
 

2017.1/aims-live-2017/debian/changelog

+aims-live (2017.2.20180425.3) unstable; urgency=medium
+
+  * Calamares settings fixes
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 25 Apr 2018 12:46:07 +0200
+
+aims-live (2017.2.20180425.2) unstable; urgency=medium
+
+  * Fix enable-locales module installation
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 25 Apr 2018 12:35:47 +0200
+
 aims-live (2017.2.20180425.1) unstable; urgency=medium
 
   * Add configuration needed for encrypted volumes

2017.1/aims-live-2017/debian/install

 artwork/install-aims-desktop.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/scripts/enable-locales usr/sbin
+calamares/bootloader-eficonfig usr/lib/calamares/modules
+calamares/mount-media-chroot usr/lib/calamares/modules
 calamares/sources-final usr/lib/calamares/modules
 calamares/sources-installtime usr/lib/calamares/modules
 calamares/unmount-media-chroot usr/lib/calamares/modules
-conf/gsettings/96_aims-desktop-live.gschema.override  usr/share/glib-2.0/schemas
+calamares/enable-locales usr/lib/calamares/modules
+conf/gsettings/96_aims-desktop-live.gschema.override usr/share/glib-2.0/schemas
 install-aims-desktop.desktop usr/share/applications