diff -r bc41dfcef0ad -r 0d303d15549e upgrade.sh --- a/upgrade.sh Wed Nov 26 23:50:04 2008 +0000 +++ b/upgrade.sh Mon Dec 08 22:23:26 2008 +0000 @@ -10,7 +10,6 @@ PF_CONFDIR=$(postconf -h config_directory) PF_GID=$(id -g $(postconf -h mail_owner)) -POSTCONF=$(which postconf) LOCALE_DIR=${PREFIX}/share/locale DOC_DIR=${PREFIX}/share/doc/vmm if [ ${PREFIX} == "/usr" ]; then @@ -18,7 +17,7 @@ else MANDIR=${PREFIX}/man fi -DOCS="ChangeLog COPYING INSTALL README" +DOCS="ChangeLog COPYING NEWS INSTALL README" INSTALL_OPTS="-g 0 -o 0 -p" INSTALL_OPTS_CF="-b -m 0640 -g ${PF_GID} -o 0 -p" @@ -43,14 +42,6 @@ done cd - >/dev/null -# remove misplaced manual pages -if [ -f /usr/local/share/man/man1/vmm.1 ]; then - rm -f /usr/local/share/man/man1/vmm.1 -fi -if [ -f /usr/local/share/man/man5/vmm.cfg.5 ]; then - rm -f /usr/local/share/man/man5/vmm.cfg.5 -fi - # install manual pages cd man [ -d ${MANDIR}/man1 ] || mkdir -m 0755 -p ${MANDIR}/man1 @@ -82,6 +73,3 @@ install -m 0644 ${INSTALL_OPTS} pgsql-*.cf ${DOC_DIR}/examples install -m 0644 ${INSTALL_OPTS} vmm.cfg ${DOC_DIR}/examples -# update config file -./update_config_0.4.x-0.5.py $POSTCONF -