Commit d18ded7f authored by Melissa Draper's avatar Melissa Draper

* Fix dependencies; add python-sphinx and imagemagick

* Add 1.7 to cron.daily
* Tweak postinst script
* Update default giturl
* Add postrm
* Move cron.daily to cron.hourly
parent 0313e356
......@@ -11,6 +11,6 @@ Homepage: manual.mahara.org
Package: maharadocs
Architecture: all
Pre-depends: debconf (>= 0.2.17)
Depends: ${misc:Depends}, apache2, gettext, git-core, bzr, make, ttf-wqy-microhei, ttf-freefont, mendexk, texlive-latex-extra, texlive-fonts-recommended, texlive-latex-recommended, texlive-xetex, ttf-indic-fonts-core, texlive-lang-all, python-pybabel
Depends: ${misc:Depends}, python-sphinx, apache2, gettext, git-core, bzr, make, ttf-wqy-microhei, ttf-freefont, mendexk, texlive-latex-extra, texlive-fonts-recommended, texlive-latex-recommended, texlive-xetex, ttf-indic-fonts-core, texlive-lang-all, python-pybabel, imagemagick
Description: localised automated sphinx docs for Mahara
This package installs the automated localised sphinx docs for Mahara to the webroot
......@@ -9,3 +9,4 @@ git pull
make -C /var/www/$RET update html epub latexpdf MAHARA=1.4
make -C /var/www/$RET update html epub latexpdf MAHARA=1.5
make -C /var/www/$RET update html epub latexpdf MAHARA=1.6
make -C /var/www/$RET update html epub latexpdf MAHARA=1.7
......@@ -27,7 +27,7 @@ esac
# but better than no check :D
if [ -d /var/www/$DIRNAME ]
then
if grep -Fxq /var/www/$DIRNAME/.git/config $GITURL
if grep -Fxq $GITURL /var/www/$DIRNAME/.git/config
then
# If we have what appears to be the correct git contents,
# just quit the script cleanly and let the rest of the
......@@ -37,7 +37,7 @@ then
exit
else
# However if it looks wrong, check if its a-ok to overwrite
if [ $OVERWRITEDIR eq 'ok' ]
if [ "$OVERWRITEDIR" == "ok" ]
then
# Buhbye!
rm -rf /var/www/$DIRNAME
......
#!/bin/sh
# postrm script for maharamanualchatter
#
# see: dh_installdeb(1)
set -e
. /usr/share/debconf/confmodule
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <overwriter>
# <overwriter-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
upgrade)
;;
purge|remove|failed-upgrade|abort-install|abort-upgrade|disappear)
db_get maharadocs/installdir
DIRNAME=$RET
rm -rf /var/www/$DIRNAME
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
......@@ -8,7 +8,7 @@ Description: Installation directory:
Template: maharadocs/giturl
Type: string
Default: https://git.gitorious.org/~melissa/mahara/melissas-mahara-manual.git
Default: https://git.gitorious.org/mahara/manual.git
Description: Git URL:
This is the URL where we will clone the git contents from.
......
Markdown is supported
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