Commit 543134ba authored by Jonathan Carter's avatar Jonathan Carter
Browse files

Commit recent changes

parent 8a86352c
*deb
*build
*changes
*dsc
......
aims-desktop (2016.10.9) unstable; urgency=medium
* Add aims-restricted-drivers
-- Jonathan Carter <jcarter@linux.com> Wed, 19 Oct 2016 13:29:09 +0200
aims-desktop (2016.10.8) unstable; urgency=medium
* Add topiconsplus
......
......@@ -15,6 +15,7 @@ Recommends: aims-artwork,
aims-fonts,
aims-keyring,
aims-utils,
aims-restricted-drivers,
aims-welcome,
apt-transport-https,
base-files (>2016),
......
......@@ -24,40 +24,114 @@ Presentation
id: presentation
Timer {
interval: 5000
running: false
interval: 20000
running: true
repeat: true
onTriggered: presentation.goToNextSlide()
}
Slide {
Image {
id: background1
source: "slide1.png"
width: 467; height: 280
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background1.horizontalCenter
anchors.top: background1.bottom
text: "Welcome to Manjaro.<br/>"+
"Manjaro is driven by a hardworking and dedicated community.<br/>"+
"During the installation, this slideshow will provide a quick introduction."
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
}
}
Slide {
Image {
id: background
source: "aimsdesktop.png"
width: 200; height: 200
id: background2
source: "slide2.png"
width: 467; height: 280
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background.horizontalCenter
anchors.top: background.bottom
text: "This is a customizable QML slideshow.<br/>"+
"Distributions should provide their own slideshow and list it in <br/>"+
"their custom branding.desc file.<br/>"+
"To create a Calamares presentation in QML, import calamares.slideshow,<br/>"+
"define a Presentation element with as many Slide elements as needed."
anchors.horizontalCenter: background2.horizontalCenter
anchors.top: background2.bottom
text: "All of Manjaro's versions are completely customizable<br/>"+
"to exactly how you want it. From theming, to the very<br/>"+
"kernel itself, it can be changed."
wrapMode: Text.WordWrap
width: root.width
width: 600
horizontalAlignment: Text.Center
}
}
Slide {
centeredText: "This is a second Slide element."
Image {
id: background3
source: "slide3.png"
width: 467; height: 280
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background3.horizontalCenter
anchors.top: background3.bottom
text: "Manjaro has three different officially supported editions.<br/>"+
"Additionally, there are a multitude of community editions<br/>"+
"to choose from, built by the community, for the community."
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
}
}
Slide {
centeredText: "This is a third Slide element."
Image {
id: background4
source: "slide4.png"
width: 467; height: 280
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background4.horizontalCenter
anchors.top: background4.bottom
text: "Manjaro has three different options for managing<br/>"+
"packages. The original command line option, Pacman<br/>"+
"and two different GUI options: Octopi or Pamac."
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
}
}
Slide {
Image {
id: background5
source: "slide5.png"
width: 467; height: 280
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background5.horizontalCenter
anchors.top: background5.bottom
text: "We appreciate you choosing Manjaro, and hope you enjoy<br/>"+
"it as much as we do making it! If you have any questions<br/>"+
"or feedback, please feel free to visit the forum, IRC, or wiki."
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
}
}
}
......@@ -4,13 +4,13 @@ CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc
cat <<EOF > $CHROOT/etc/apt/sources.list
# Debian
deb http://http.debian.net/debian stretch main contrib
#deb-src http://http.debian.net/debian stretch main contrib
deb http://http.debian.net/debian stretch main
#deb-src http://http.debian.net/debian stretch main
# 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
deb http://ppa.aims.ac.za/aims-ppa stretch main restricted
#deb-src http://ppa.aims.ac.za/aims-ppa stretch main restricted
deb http://ppa.aims.ac.za/sagemath-ppa stretch main
#deb-src http://ppa.aims.ac.za/sagemath-ppa stretch main
EOF
Package: aims-live
Version: 2016.35
Version: 2016.37
Architecture: all
Maintainer: Jonathan Carter <jcarter@linux.com>
Installed-Size: 207
Installed-Size: 208
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
......
......@@ -9,7 +9,7 @@ f0a5927a994d0f166f025cfb7f24e644 usr/sbin/sources-final
c253e89eb9a34ef1431515a63f7b4ea7 usr/sbin/sources-installtime
ab3179cb9bcb22bc1dd60dfdbabbf3de usr/sbin/unmount-media-chroot
eaf5f40b42643ee7fb20999b24922210 usr/share/applications/install-aims-desktop.desktop
8bbc4928bced39098e76e5980233630a usr/share/doc/aims-live/changelog.gz
fa5963ebe139f8038d3b0408ff7f813f usr/share/doc/aims-live/changelog.gz
0b17a4e5a2b1a6b3e11493fbe4213fbf usr/share/doc/aims-live/copyright
3e90273860aca01c2803f978efb90ae6 usr/share/glib-2.0/schemas/96_aims-desktop-live.gschema.override
ac59dcf14670dc78213f8572b185fbd2 usr/share/glib-2.0/schemas/96_aims-desktop-live.gschema.override
c158494fa3b60e0dba9f2ef6fa0d9bd1 usr/share/pixmaps/install-aims-desktop.png
# Launcher icons
[org.gnome.shell]
favorite-apps=['install-aims-desktop.desktop', 'firefox-esr.desktop', 'chromium.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'texmaker.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'terminator.desktop', 'gnome-control-center.desktop', 'yelp.desktop']
favorite-apps=['install-aims-desktop.desktop', 'firefox-esr.desktop', 'chromium.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'texmaker.desktop', 'sagemath.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'terminator.desktop', 'gnome-calculator', 'gnome-control-center.desktop', 'yelp.desktop']
# Lockdown
[org.gnome.desktop.lockdown]
......@@ -8,3 +8,6 @@ disable-lock-screen=true
[org.gnome.desktop.session]
idle-delay=0
[org.gnome.desktop.screensaver]
lock-enabled=false
aims-live (2016.38) unstable; urgency=medium
* Update sources.list
-- Jonathan Carter <jcarter@linux.com> Wed, 19 Oct 2016 13:23:50 +0200
aims-live (2016.37) unstable; urgency=medium
* Add calculator to live launcher
......
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