Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/perl-package-stash-xs/PKGBUILD
	extra/mesa/PKGBUILD

1 files changed, 5 insertions, 5 deletions

diff --git a/extra/emacs/emacs.install b/extra/emacs/emacs.install
index fa9ffeeb1..6712f44ba 100644
--- a/extra/emacs/emacs.install
+++ b/extra/emacs/emacs.install
@@ -1,11 +1,11 @@
 ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
 ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
+speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
@@ -13,7 +13,7 @@ post_install() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -27,6 +27,6 @@ pre_remove() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }