Commit 593f2751 authored by Jonathan Carter's avatar Jonathan Carter
Browse files

Commit recent changes

parent 7156a00e
Package: aims-desktop
Version: 2016.07.3
Version: 2016.07.7
Architecture: all
Maintainer: Jonathan Carter <jcarter@linux.com>
Installed-Size: 15
Depends: dconf-gsettings-backend | gsettings-backend
Recommends: aims-artwork, aims-fonts, aims-keyring, apt-transport-https, command-not-found, curl, chromium, dconf-tools, debconf-utils, dia-gnome, ethtool, expect, faenza-icon-theme, fbreader, geogebra | geogebra5, gimp, git, gnome, gnome-mail, gnome-shell-extension-dashtodock, gnome-shell-extension-disconnect-hide-activities, gnome-shell-extension-disconnect-wifi, gnome-shell-extension-move-clock, gnome-shell-extension-pixelsaver, gnome-shell-extension-refresh-wifi, gnome-shell-extension-remove-dropdown-arrows, gnome-shell-extension-taskbar, gnome-shell-extension-topicons, gnuchess, googlecl, gparted, gpm, grub-pc, gtypist, host, hunspell-en-us, ipcalc, iputils-tracepath, jwhois, language-pack-gnome-en, libreoffice, libreoffice-gnome, locate, mc, mdbtools, mdbtools-gmdb, nautilus-actions, nautilus-image-converter, nautilus-open-terminal, network-manager-gnome, network-manager-vpnc-gnome, pastebinit, python-gdata, python-pip, python-pygooglechart, python3-pip, synaptic, terminator, texmaker, traceroute, transfig, vim, virtualbox-guest-x11, xchat, xfig, xserver-xorg-legacy, kbd, consolekit, vlc, clementine
Recommends: aims-artwork, aims-fonts, aims-keyring, aims-utils, apt-transport-https, base-files (>= 2016), chromium, clementine, command-not-found, consolekit, debconf-utils, dia-gnome, faenza-icon-theme, fbreader, geogebra | geogebra5, gimp, gnome, gnome-mail, gnome-shell-extension-dashtodock, gnome-shell-extension-disconnect-hide-activities, gnome-shell-extension-disconnect-wifi, gnome-shell-extension-move-clock, gnome-shell-extension-pixelsaver, gnome-shell-extension-refresh-wifi, gnome-shell-extension-remove-dropdown-arrows, gnome-shell-extension-taskbar, gnome-shell-extension-topicons, gnuchess, googlecl, grub-pc, gtypist, hunspell-en-us, kbd, language-pack-gnome-en, libreoffice, libreoffice-gnome, nautilus-actions, nautilus-image-converter, nautilus-open-terminal, network-manager-gnome, network-manager-vpnc-gnome, python-gdata, python-pip, python-pygooglechart, python3-pip, terminator, texmaker, transfig, virtualbox-guest-x11, vlc, xchat, xfig, xserver-xorg-legacy
Section: metapackages
Priority: optional
Homepage: https://www.aims.ac.za
......
70a82e842722c66e323ef6cf6f661656 usr/share/doc/aims-desktop/changelog.gz
f7416e4aca70a7d3bdfe39b6b78658bd usr/share/doc/aims-desktop/changelog.gz
088e861b63bec0df49857ea6e97d5e23 usr/share/doc/aims-desktop/copyright
d8bda020c188d5edf98ac8aa78584aa2 usr/share/glib-2.0/schemas/95_aims-desktop.gschema.override
aims-desktop (2016.07.7) unstable; urgency=medium
* Install new base files
-- Jonathan Carter <jcarter@linux.com> Wed, 27 Jul 2016 12:14:58 +0200
aims-desktop (2016.07.6) unstable; urgency=medium
* Move utils out to aims-utils
-- Jonathan Carter <jcarter@linux.com> Wed, 27 Jul 2016 11:23:56 +0200
aims-desktop (2016.07.5) unstable; urgency=medium
* Add usb-creator-gtk tp recommends
......
......@@ -14,20 +14,19 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: aims-artwork,
aims-fonts,
aims-keyring,
aims-utils,
apt-transport-https,
command-not-found,
curl,
base-files (>2016),
chromium,
dconf-tools,
clementine,
command-not-found,
consolekit,
debconf-utils,
dia-gnome,
ethtool,
expect,
faenza-icon-theme,
fbreader,
geogebra | geogebra5,
gimp,
git,
gnome,
gnome-mail,
gnome-shell-extension-dashtodock,
......@@ -41,48 +40,30 @@ Recommends: aims-artwork,
gnome-shell-extension-topicons,
gnuchess,
googlecl,
gparted,
gpm,
grub-pc,
gtypist,
host,
hunspell-en-us,
ipcalc,
iputils-tracepath,
jwhois,
kbd,
language-pack-gnome-en,
libreoffice,
libreoffice-gnome,
locate,
mc,
mdbtools,
mdbtools-gmdb,
memtest86+,
nautilus-actions,
nautilus-image-converter,
nautilus-open-terminal,
network-manager-gnome,
network-manager-vpnc-gnome,
pastebinit,
python-gdata,
python-pip,
python-pygooglechart,
python3-pip,
synaptic,
terminator,
texmaker,
traceroute,
transfig,
vim,
virtualbox-guest-x11,
vlc,
xchat,
xfig,
xserver-xorg-legacy,
kbd,
consolekit,
vlc,
clementine,
usb-creator-gtk
xserver-xorg-legacy
Description: African Institute for Mathematical Sciences desktop metapackage
This metapackage is used to install AIMS laptops and desktops with
scientific software such as Sage, SciPy, Texmaker, and restricted
......
aims-desktop_2016.07.3_all.deb metapackages optional
aims-desktop_2016.07.7_all.deb metapackages optional
---
type: "job"
name: "bootloader-eficonfig"
interface: "process"
command: "/usr/sbin/bootloader-eficonfig"
---
type: "job"
name: "mount-media-chroot"
interface: "process"
command: "/usr/sbin/mount-media-chroot"
chroot: false
#!/bin/sh
if [ -d /sys/firmware/efi/efivars ]; then
echo " * Replacing grub-pc with grub-efi..."
# grub-probe doesn't work in a chroot...
mv /usr/sbin/grub-probe /usr/sbin/grub-probe.bak
echo "exit 0" > /usr/sbin/grub-probe
chmod +x /usr/sbin/grub-probe
apt-get --allow-unauthenticated -y install grub-efi
mv -f /usr/sbin/grub-probe.bak /usr/sbin/grub-probe
fi
#!/bin/sh
# This script runs on the live media, ie. outside of the chroot environment.
# debian-live ensures that this is always at the same place, so we can just bind-mount it
MEDIA="/lib/live/mount/medium"
# More tricky, we need to figure out where calamares left us the chroot.
# This seems to work reliably in all tested cases.
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
mkdir -p $CHROOT/media/installer
mount --bind $MEDIA $CHROOT/media/installer
#!/bin/bash
echo <<EOF > /etc/apt/sources.list
# Debian
deb http://http.debian.net/debian stretch main contrib
#deb-src http://http.debian.net/debian stretch main contrib
# TODO: Add stretch-updates and stretch-security when available
# AIMS Desktop
deb http://ppa.aims.ac.za/aims-ppa stretch main
#deb-src http://ppa.aims.ac.za/aims-ppa stretch main
EOF
#!/bin/sh
# Note: relies on installation media being mounted on /media/usb
echo "#AIMS Desktop Installer" > /etc/apt/sources.list
echo "deb file:///media/installer" >> /etc/apt/sources.list
apt-get update
#!/bin/sh
# This script runs on the live media, ie. outside of the chroot environment.
# debian-live ensures that this is always at the same place, so we can just bind-mount it
MEDIA="/lib/live/mount/medium"
# More tricky, we need to figure out where calamares left us the chroot.
# This seems to work reliably in all tested cases.
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
umount -l $CHROOT/media/installer
rmdir $CHROOT/media/installer
......@@ -33,19 +33,23 @@ sequence:
- partition
- mount
- unpackfs
- sources-installtime
- machineid
- fstab
- locale
- keyboard
- bootloader-eficonfig
- packages
- mount-media-chroot
- localecfg
- users
#- displaymanager
- networkcfg
- hwclock
- services
- grubcfg
- bootloader
- unmount-media-chroot
- sources-final
- initramfs
- umount
......
---
type: "job"
name: "sources-final"
interface: "process"
command: "/usr/sbin/sources-final"
---
type: "job"
name: "sources-installtime"
interface: "process"
command: "/usr/sbin/sources-installtime"
---
type: "job"
name: "unmount-media-chroot"
interface: "process"
command: "/usr/sbin/unmount-media-chroot"
chroot: false
/etc/calamares/bootloader-eficonfig/module.desc
/etc/calamares/branding/aimsdesktop/aimsdesktop.png
/etc/calamares/branding/aimsdesktop/branding.desc
/etc/calamares/branding/aimsdesktop/languages.png
/etc/calamares/branding/aimsdesktop/show.qml
/etc/calamares/modules/finished.conf
/etc/calamares/modules/locale.conf
/etc/calamares/modules/packages.conf
/etc/calamares/modules/unpackfs.conf
/etc/calamares/modules/users.conf
/etc/calamares/modules/webview.conf
/etc/calamares/modules/welcome.conf
/etc/calamares/mount-media-chroot/module.desc
/etc/calamares/scripts/bootloader-eficonfig
/etc/calamares/scripts/mount-media-chroot
/etc/calamares/scripts/sources-final
/etc/calamares/scripts/sources-installtime
/etc/calamares/scripts/unmount-media-chroot
/etc/calamares/settings.conf
/etc/calamares/sources-final/module.desc
/etc/calamares/sources-installtime/module.desc
/etc/calamares/unmount-media-chroot/module.desc
Package: aims-live
Version: 2016.17
Version: 2016.21
Architecture: all
Maintainer: Jonathan Carter <jcarter@linux.com>
Installed-Size: 170
Installed-Size: 207
Depends: calamares, live-boot, live-boot-initramfs-tools, live-config, live-config-systemd, live-tools, xserver-xorg-legacy, user-setup, dconf-gsettings-backend | gsettings-backend
Conflicts: plymouth, texlive-fonts-extra, texlive-latex-extra-doc, texlive-pictures-doc, texlive-pstricks-doc
Section: gnome
......
9d8a93143a1f20af510ded9a24eff12c usr/lib/calamares/modules/bootloader-eficonfig/module.desc
cfe04b8d3dc177631e1c8ca3d9f15b44 usr/lib/calamares/modules/mount-media-chroot/module.desc
d7ff8b34bf24e5ffc02325c12d0c0556 usr/lib/calamares/modules/sources-final/module.desc
3eadea9ee31ecf977d18e1eedb442972 usr/lib/calamares/modules/sources-installtime/module.desc
da7e8c307c37dd1a92c8cd57692ddf80 usr/lib/calamares/modules/unmount-media-chroot/module.desc
2027fe2f951233a60971a3a315bd75cb usr/sbin/bootloader-eficonfig
bfb7448da40ac0fbaab555c09a39ab51 usr/sbin/mount-media-chroot
da03c7a37a91dee313af933e30925609 usr/sbin/sources-final
33d868af0f2fde4f343ea4af7f5549c7 usr/sbin/sources-installtime
26c31ed118a7d8d50c53498519055e94 usr/sbin/unmount-media-chroot
eaf5f40b42643ee7fb20999b24922210 usr/share/applications/install-aims-desktop.desktop
287011abddc470305c74301e6cc0ae7d usr/share/doc/aims-live/changelog.gz
f377999e2729145e81975023bf814abf usr/share/doc/aims-live/changelog.gz
0b17a4e5a2b1a6b3e11493fbe4213fbf usr/share/doc/aims-live/copyright
61b998270ac9a3260a9307cc5aea4d04 usr/share/glib-2.0/schemas/96_aims-desktop-live.gschema.override
c158494fa3b60e0dba9f2ef6fa0d9bd1 usr/share/pixmaps/install-aims-desktop.png
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment