Commit 7b9fb05b authored by Jan Groenewald's avatar Jan Groenewald
Browse files

Merge branch 'master' of git.aims.ac.za:aims-desktop/aims-desktop-metapackages

parents ea530013 1f2ae453
dh_update_autotools_config
dh_auto_configure
dh_auto_build
dh_auto_test
dh_prep
dh_auto_install
dh_install
dh_installdocs
dh_installchangelogs
dh_perl
dh_link
dh_strip_nondeterminism
dh_compress
dh_fixperms
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
dh_builddeb
Package: aims-keyring
Version: 2016.05.1
Architecture: all
Maintainer: Jonathan Carter <jcarter@linux.com>
Installed-Size: 15
Section: utils
Priority: optional
Homepage: https://help.aims.ac.za
Description: APT keyring for AIMS Desktop
APT keyring for AIMS Desktop.
.
Do not add or remove unless you understand what you're doing.
479659b7b749fddc696123577ba7471b usr/share/doc/aims-keyring/changelog.gz
1f7ba7fcc744867305bfb9c51e1f6606 usr/share/doc/aims-keyring/copyright
aims-keyring (2016.05.1) unstable; urgency=medium
* Initial release
-- Jonathan Carter <jcarter@linux.com> Tue, 24 May 2016 15:01:45 +0200
aims-keyring_2016.05.1_all.deb utils optional
...@@ -52,6 +52,7 @@ sequence: ...@@ -52,6 +52,7 @@ sequence:
- packages - packages
- luksbootkeyfile - luksbootkeyfile
- luksopenswaphookcfg - luksopenswaphookcfg
- plymouthcfg
- initramfscfg - initramfscfg
- initramfs - initramfs
- grubcfg - grubcfg
......
Package: aims-live Package: aims-live
Version: 2017.2.20180912.1 Version: 2017.2.20180924.1
Architecture: all Architecture: all
Maintainer: Jonathan Carter <jcarter@linux.com> Maintainer: Jonathan Carter <jcarter@linux.com>
Installed-Size: 215 Installed-Size: 216
Depends: calamares, hashcheck, live-boot, live-boot-initramfs-tools, live-config, live-config-systemd, live-tools, qml-module-qtquick-window2, qml-module-qtquick2, user-setup, xserver-xorg-legacy, md5sumchecker, dconf-gsettings-backend | gsettings-backend Depends: calamares, hashcheck, live-boot, live-boot-initramfs-tools, live-config, live-config-systemd, live-tools, qml-module-qtquick-window2, qml-module-qtquick2, user-setup, xserver-xorg-legacy, md5sumchecker, dconf-gsettings-backend | gsettings-backend
Conflicts: antiword, catdoc, cups-browsed, cython-doc, docbook-dsssl, docutils-doc, ecl-doc, fckeditor, fflas-ffpack-dev-doc, fflas-ffpack-user-doc, gmp-doc, httpd-cgi, libgmp10-doc, libmpfi-doc, libmpfr-dev, mercurial, nauty-doc, pari-galpol, pari-gp2c, python-4suite-xml, python-attr-doc, python-cairocffi, python-configobj, python-cycler-doc, python-cysignals-doc, python-flask-autoindex-doc, python-flask-babel-doc, python-flask-doc, python-flask-openid-doc, python-flask-silk-doc, python-flup, python-fpylll-doc, python-gd-dbg, python-gdchart, python-genshi, python-glade2, python-greenlet, python-ldap, python-manuel, python-matplotlib-doc, python-memcache, python-mpmath-doc, python-mysqldb, python-networkx-doc, python-nose, python-pam, python-ply-doc, python-pydot, python-pylibmc, python-pyparsing-doc, python-pyxmpp, python-qt3, python-qt4, python-redis, python-rpy-docs, python-scipy-doc, python-serial, python-sip, python-sphinx-rtd-theme, python-stemmer, python-traits, python-twisted-bin-dbg, python-werkzeug-doc, python-wxgtk3.0, python-xml, python-zope.testing, sagetex-doc, singular-dev-doc, slime, sphinx-doc, sqlite3-doc, symmetrica-doc, tachyon-doc, texlive-fonts-extra-doc, texlive-latex-base-doc, texlive-latex-extra-doc, texlive-latex-recommended-doc, texlive-pictures-doc, texlive-pstricks-doc, texlive-publishers-doc, texlive-science-doc Conflicts: antiword, catdoc, cups-browsed, cython-doc, docbook-dsssl, docutils-doc, ecl-doc, fckeditor, fflas-ffpack-dev-doc, fflas-ffpack-user-doc, gmp-doc, httpd-cgi, libgmp10-doc, libmpfi-doc, libmpfr-dev, mercurial, nauty-doc, pari-galpol, pari-gp2c, python-4suite-xml, python-attr-doc, python-cairocffi, python-configobj, python-cycler-doc, python-cysignals-doc, python-flask-autoindex-doc, python-flask-babel-doc, python-flask-doc, python-flask-openid-doc, python-flask-silk-doc, python-flup, python-fpylll-doc, python-gd-dbg, python-gdchart, python-genshi, python-glade2, python-greenlet, python-ldap, python-manuel, python-matplotlib-doc, python-memcache, python-mpmath-doc, python-mysqldb, python-networkx-doc, python-nose, python-pam, python-ply-doc, python-pydot, python-pylibmc, python-pyparsing-doc, python-pyxmpp, python-qt3, python-qt4, python-redis, python-rpy-docs, python-scipy-doc, python-serial, python-sip, python-sphinx-rtd-theme, python-stemmer, python-traits, python-twisted-bin-dbg, python-werkzeug-doc, python-wxgtk3.0, python-xml, python-zope.testing, sagetex-doc, singular-dev-doc, slime, sphinx-doc, sqlite3-doc, symmetrica-doc, tachyon-doc, texlive-fonts-extra-doc, texlive-latex-base-doc, texlive-latex-extra-doc, texlive-latex-recommended-doc, texlive-pictures-doc, texlive-pstricks-doc, texlive-publishers-doc, texlive-science-doc
Section: gnome Section: gnome
......
...@@ -10,8 +10,8 @@ c72e4cd93838046cb1993a0e7348f5a6 usr/sbin/enable-locales ...@@ -10,8 +10,8 @@ c72e4cd93838046cb1993a0e7348f5a6 usr/sbin/enable-locales
728094981cb53e8d086908db21e355a9 usr/sbin/sources-final 728094981cb53e8d086908db21e355a9 usr/sbin/sources-final
c253e89eb9a34ef1431515a63f7b4ea7 usr/sbin/sources-installtime c253e89eb9a34ef1431515a63f7b4ea7 usr/sbin/sources-installtime
ab3179cb9bcb22bc1dd60dfdbabbf3de usr/sbin/unmount-media-chroot ab3179cb9bcb22bc1dd60dfdbabbf3de usr/sbin/unmount-media-chroot
eaf5f40b42643ee7fb20999b24922210 usr/share/applications/install-aims-desktop.desktop 5714184e5b32e56637813b80281ca43f usr/share/applications/install-aims-desktop.desktop
ce73ee5f8fce1fd5e33ea6e4381bcb25 usr/share/doc/aims-live/changelog.gz b13eac9646ee57ee33272160bf44d3f4 usr/share/doc/aims-live/changelog.gz
0b17a4e5a2b1a6b3e11493fbe4213fbf usr/share/doc/aims-live/copyright 0b17a4e5a2b1a6b3e11493fbe4213fbf usr/share/doc/aims-live/copyright
0768e481533b432cb00be1223d8d6e35 usr/share/glib-2.0/schemas/96_aims-desktop-live.gschema.override 0768e481533b432cb00be1223d8d6e35 usr/share/glib-2.0/schemas/96_aims-desktop-live.gschema.override
1b1b308ccae91dcb2d2790f2cd6cf4ef usr/share/pixmaps/install-aims-desktop.png 1343c39ada8ebf42d66471e044d4728c usr/share/pixmaps/install-aims-desktop.png
...@@ -11,9 +11,15 @@ chmod +s /bin/ping ...@@ -11,9 +11,15 @@ chmod +s /bin/ping
chmod 0755 / chmod 0755 /
# Add splash for grub, if you dont want it, add 'nosplash' # Add splash for grub, if you dont want it, add 'nosplash'
if [ $(grep GRUB_CMDLINE_LINUX_DEFAULT /etc/default/grub) = \ sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"/' /etc/default/grub
'GRUB_CMDLINE_LINUX_DEFAULT="quiet"' ]; then update-grub
sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"/g' /etc/default/grub
fi case "$1" in
remove)
# Restore original Calamares icon
dpkg-divert --quiet --rename --package aims-live \
--remove /usr/share/applications/calamares.desktop
;;
esac
exit 0 exit 0
#!/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
...@@ -52,6 +52,7 @@ sequence: ...@@ -52,6 +52,7 @@ sequence:
- packages - packages
- luksbootkeyfile - luksbootkeyfile
- luksopenswaphookcfg - luksopenswaphookcfg
- plymouthcfg
- initramfscfg - initramfscfg
- initramfs - initramfs
- grubcfg - grubcfg
......
...@@ -8,3 +8,4 @@ Comment=Calamares — AIMS Desktop Installer ...@@ -8,3 +8,4 @@ Comment=Calamares — AIMS Desktop Installer
Icon=install-aims-desktop Icon=install-aims-desktop
Terminal=false Terminal=false
Categories=Qt; Categories=Qt;
StartupWMClass=calamares
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