merge

2017.1/aims-live-2017/calamares/scripts/sources-final

@@ -3,17 +3,27 @@
 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
 
 cat <<EOF > $CHROOT/etc/apt/sources.list
-# Debian
+## Debian
+
+# Main
 deb http://deb.debian.org/debian stretch main
 #deb-src http://deb.debian.org/debian stretch main
+
+# Updates
 deb http://deb.debian.org/debian stretch-updates main
 #deb-src http://deb.debian.org/debian stretch-updates main
+
+# Backports (cherrypick only!)
 deb http://deb.debian.org/debian stretch-backports main
-#deb-src http://deb.debian.org/debian stretch-updates main
+#deb-src http://deb.debian.org/debian stretch-backports main
+
+# Security (unattended upgrades)
 deb http://security.debian.org/ stretch/updates main
 #deb-src http://security.debian.org/ stretch/updates main
 
-# AIMS Desktop
+
+## AIMS Desktop
+
 deb http://ppa.aims.ac.za/aims-ppa stretch main restricted
 #deb-src http://ppa.aims.ac.za/aims-ppa stretch main restricted
 EOF

2017.1/aims-live-2017/debian/aims-live/DEBIAN/preinst

+#!/bin/sh
+set -e
+
+case "$1" in
+    install|upgrade)
+        cleanup_and_divert() {
+            # Play it safe because diverts can go wrong 
+            if [ -f $1.orig ]; then
+                mv $1.orig $1
+            fi
+            dpkg-divert --quiet --package aims-live \
+		        --divert $1.orig --rename $1
+        }
+
+        # Calamares .desktop file
+        cleanup_and_divert /usr/share/applications/calamares.desktop
+    ;;
+esac
+
+

2017.1/aims-live-2017/debian/changelog

@@ -17,6 +17,12 @@ aims-live (2017.2.20180919.1) stretch; urgency=medium
 
  -- Jonathan Carter <jcc@debian.org>  Wed, 19 Sep 2018 13:38:00 +0200
 
+aims-live (2017.2.20180913.2) stretch; urgency=medium
+
+  * Fix typo and prettify sources-final
+
+ -- Jan Groenewald <jan@aims.ac.za>  Tue, 25 Sep 2018 16:32:24 +0200
+
 aims-live (2017.2.20180913.1) stretch; urgency=medium
 
   * Fix splash option in /etc/default/grub