From eb415bf35a54923c20a0b9d6973968676cedfe61 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sat, 8 Apr 2006 02:46:41 +0000 Subject: [PATCH] Make things in contrib directory installable. * Makefile (SUBDIRS): Add contrib. (all): Add contrib. (contrib): New target that compiles things in the contrib directory. (install-bin): Add contrib. Install things in the contrib directory. Also install uncompiled things in the experimental directory. * contrib/Makefile: New Makefile for the contrib directory. * contrib/httpd.el (httpd-start): Fix compiler warnings. * debian/emacsen-install: Compile files in contrib directory in addition to the normal fare. Thanks to Junichi Uekawa for the suggestion. * debian/emacsen-startup: Add contrib directory to load-path. * experimental/Makefile (test): Remove target. (install-uncompiled): New target that installs uncompiled files. * lisp/muse.el: Set version to 3.02.90 (3.03 RC1). (muse-update-file-extension): Fix a warning that occurred when doing batch publishing. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-96 --- ChangeLog.2006 | 38 ++++++++++++++++++++++++++++++++++++++ Makefile | 13 +++++++++---- Makefile.defs | 2 +- contrib/Makefile | 25 +++++++++++++++++++++++++ contrib/httpd.el | 13 ++++++++----- debian/changelog | 8 ++++++-- debian/emacsen-install | 49 +++++++++++++++++++++++-------------------------- debian/emacsen-startup | 9 ++++++--- experimental/Makefile | 8 ++++---- lisp/muse.el | 11 ++++++----- muse.texi | 2 +- 11 files changed, 127 insertions(+), 51 deletions(-) create mode 100644 contrib/Makefile diff --git a/ChangeLog.2006 b/ChangeLog.2006 index 842fba4..597b56a 100644 --- a/ChangeLog.2006 +++ b/ChangeLog.2006 @@ -2,6 +2,44 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0 # +2006-04-08 02:46:41 GMT Michael Olson patch-96 + + Summary: + Make things in contrib directory installable. + Revision: + muse--main--1.0--patch-96 + + * Makefile (SUBDIRS): Add contrib. + (all): Add contrib. + (contrib): New target that compiles things in the contrib directory. + (install-bin): Add contrib. Install things in the contrib directory. + Also install uncompiled things in the experimental directory. + + * contrib/Makefile: New Makefile for the contrib directory. + + * contrib/httpd.el (httpd-start): Fix compiler warnings. + + * debian/emacsen-install: Compile files in contrib directory in addition + to the normal fare. Thanks to Junichi Uekawa for the suggestion. + + * debian/emacsen-startup: Add contrib directory to load-path. + + * experimental/Makefile (test): Remove target. + (install-uncompiled): New target that installs uncompiled files. + + * lisp/muse.el: Set version to 3.02.90 (3.03 RC1). + (muse-update-file-extension): Fix a warning that occurred when doing + batch publishing. + + new files: + contrib/.arch-ids/Makefile.id contrib/Makefile + + modified files: + ChangeLog.2006 Makefile Makefile.defs contrib/httpd.el + debian/changelog debian/emacsen-install debian/emacsen-startup + experimental/Makefile lisp/muse.el muse.texi + + 2006-04-08 01:33:27 GMT Michael Olson patch-95 Summary: diff --git a/Makefile b/Makefile index b09f02d..836e148 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,18 @@ -.PHONY: all lisp autoloads examples experimental doc clean realclean distclean fullclean install-info install-bin install test dist release debbuild debrevision debrelease upload +.PHONY: all lisp contrib autoloads examples experimental doc clean realclean distclean fullclean install-info install-bin install test dist release debbuild debrevision debrelease upload .PRECIOUS: %.info %.html include Makefile.defs -SUBDIRS = lisp examples experimental +SUBDIRS = lisp contrib examples experimental -all: autoloads lisp muse.info +all: autoloads lisp contrib muse.info lisp: (cd lisp && $(MAKE)) +contrib: + (cd contrib && $(MAKE)) + autoloads: (cd lisp && $(MAKE) autoloads) @@ -41,8 +44,10 @@ install-info: muse.info install -m 0644 muse.info $(INFODIR)/muse $(INSTALLINFO) $(INFODIR)/muse -install-bin: lisp +install-bin: lisp contrib (cd lisp && $(MAKE) install) + (cd contrib && $(MAKE) install) + (cd experimental && $(MAKE) install-uncompiled) install: install-bin install-info diff --git a/Makefile.defs b/Makefile.defs index 2294377..f72c883 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -20,6 +20,6 @@ INSTALLINFO = install-info --info-dir=$(INFODIR) #INSTALLINFO = install-info --section "Emacs" "emacs" --info-dir=$(INFODIR) # Useful only for the maintainer -VERSION = 3.02.6.arch.93 +VERSION = 3.02.90.arch.96 LASTUPLOAD = 3.02.6-2 BUILDOPTS = diff --git a/contrib/Makefile b/contrib/Makefile new file mode 100644 index 0000000..323cbe2 --- /dev/null +++ b/contrib/Makefile @@ -0,0 +1,25 @@ +.PHONY: all contrib clean realclean distclean fullclean install +.PRECIOUS: %.elc + +include ../Makefile.defs + +EL = $(wildcard *.el) +ELC = $(patsubst %.el,%.elc,$(EL)) + +all: contrib + +contrib: $(ELC) + +muse-build.elc: ../scripts/muse-build.el + @echo muse-build.el is not byte-compiled + +%.elc: %.el + @$(EMACS) -q $(SITEFLAG) -batch -l ../scripts/muse-build.el \ + -f batch-byte-compile $< + +clean realclean distclean fullclean: + -rm -f *.elc *~ + +install: lisp + install -d $(ELISPDIR)/contrib + install -m 0644 $(EL) $(ELC) $(ELISPDIR)/contrib diff --git a/contrib/httpd.el b/contrib/httpd.el index 0adc53c..3aba829 100644 --- a/contrib/httpd.el +++ b/contrib/httpd.el @@ -253,11 +253,11 @@ content.") ))) (defun httpd-start (&optional port) - (interactive (list (read-input "Serve Web requests on port: " "8080"))) + (interactive (list (read-string "Serve Web requests on port: " "8080"))) (if (null port) (setq port 8080) (if (stringp port) - (setq port (string-to-int port)))) + (setq port (string-to-number port)))) (if httpd-process (delete-process httpd-process)) (setq httpd-process @@ -267,9 +267,12 @@ content.") :host 'local :service port :server t :noquery t :filter 'httpd-serve) - (open-network-stream-server "httpd" (generate-new-buffer "httpd") - port nil 'httpd-serve))) - (if (eq (process-status httpd-process) 'listen) + (and (fboundp 'open-network-stream-server) + (open-network-stream-server "httpd" + (generate-new-buffer "httpd") + port nil 'httpd-serve)))) + (if (and (processp httpd-process) + (eq (process-status httpd-process) 'listen)) (message "httpd.el is listening on port %d" port))) (defun httpd-stop () diff --git a/debian/changelog b/debian/changelog index 6fa1f3f..364f5fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -muse-el (3.02.6.arch.93-1) unstable; urgency=low +muse-el (3.02.90.arch.96-1) unstable; urgency=low * New Arch snapshot. + * Bug fix: "muse-el: Doesn't escape specials when publish using the + latex style", thanks to Jeremy Hankins (Closes: #340620). + * Bug fix: "muse-el: muse-http.el is not functional", thanks to Junichi + Uekawa (Closes: #357949). - -- Michael W. Olson (GNU address) Fri, 7 Apr 2006 21:20:11 -0400 + -- Michael W. Olson (GNU address) Fri, 7 Apr 2006 21:45:14 -0400 muse-el (3.02.6-2) unstable; urgency=low diff --git a/debian/emacsen-install b/debian/emacsen-install index 6af750d..a43297f 100644 --- a/debian/emacsen-install +++ b/debian/emacsen-install @@ -19,34 +19,31 @@ else SITEFLAG="--no-site-file" fi FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" +ELPREFIX=/usr/share/emacs/site-lisp/${PACKAGE} -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -# Install-info-altdir does not actually exist. -# Maybe somebody will write it. -# if test -x /usr/sbin/install-info-altdir; then -# echo install/${PACKAGE}: install Info links for ${FLAVOR} -# install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz -# fi - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`ls -1 *.el | grep -v autoloads` -rm -f ${ELCDIR}/*.el -cp ${FILES} ${ELCDIR} -cd ${ELCDIR} - -cat << EOF > path.el -(setq load-path (cons "." (cons "${ELDIR}/contrib" load-path)) +for i in ${PACKAGE} ${PACKAGE}/contrib; do + + ELDIR=/usr/share/emacs/site-lisp/$i + ELCDIR=/usr/share/${FLAVOR}/site-lisp/$i + + install -m 755 -d ${ELCDIR} + cd ${ELDIR} + FILES=`ls -1 *.el | grep -v autoloads` + rm -f ${ELCDIR}/*.el + cp ${FILES} ${ELCDIR} + cd ${ELCDIR} + + cat << EOF > path.el +(setq load-path (cons "${ELPREFIX}" (cons "${ELPREFIX}/contrib" load-path)) byte-compile-warnings nil) EOF -${FLAVOR} ${FLAGS} ${FILES} 2>&1 | gzip -9qf > CompilationLog.gz -rm -f *.el path.el -( cd ${ELDIR} - for f in *.el; do - ln -sf ${ELDIR}/${f} ${ELCDIR}/${f} - done -) + ${FLAVOR} ${FLAGS} ${FILES} 2>&1 | gzip -9qf > CompilationLog.gz + rm -f *.el path.el + ( cd ${ELDIR} + for f in *.el; do + ln -sf ${ELDIR}/${f} ${ELCDIR}/${f} + done + ) +done exit 0 diff --git a/debian/emacsen-startup b/debian/emacsen-startup index 522b2e6..86547f1 100644 --- a/debian/emacsen-startup +++ b/debian/emacsen-startup @@ -5,6 +5,7 @@ ;; Originally contributed by Nils Naumann ;; Modified by Dirk Eddelbuettel ;; Adapted for dh-make by Jim Van Zandt +;; Adapted for Muse by Michael Olson ;; The muse package follows the Debian/GNU Linux 'emacsen' policy and ;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, @@ -14,8 +15,10 @@ ;; Add the source file (when (fboundp 'debian-pkg-add-load-path-item) - (debian-pkg-add-load-path-item (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/muse-el"))) + (let ((prefix (concat "/usr/share/" + (symbol-name flavor) + "/site-lisp/muse-el"))) + (debian-pkg-add-load-path-item prefix) + (debian-pkg-add-load-path-item (concat prefix "/contrib")))) (load "muse-autoloads.el") diff --git a/experimental/Makefile b/experimental/Makefile index 374bae3..2485318 100644 --- a/experimental/Makefile +++ b/experimental/Makefile @@ -1,4 +1,4 @@ -.PHONY: all lisp clean realclean distclean fullclean install test +.PHONY: all experimental clean realclean distclean fullclean install install-uncompiled .PRECIOUS: %.elc include ../Makefile.defs @@ -24,6 +24,6 @@ install: $(ELC) install -d $(ELISPDIR)/experimental install -m 0644 $(EL) $(ELC) $(ELISPDIR)/experimental -test: $(ELC) - $(EMACS) -q $(SITEFLAG) -batch -l ../scripts/muse-build.el \ - -f muse-elint-files muse-*.el +install-uncompiled: + install -d $(ELISPDIR)/experimental + install -m 0644 $(EL) $(ELISPDIR)/experimental diff --git a/lisp/muse.el b/lisp/muse.el index df2ca93..d44d5b5 100644 --- a/lisp/muse.el +++ b/lisp/muse.el @@ -4,8 +4,8 @@ ;; Emacs Lisp Archive Entry ;; Filename: muse.el -;; Version: 3.02.6 -;; Date: Sat 12-Jan-2006 +;; Version: 3.02.90 (3.03 RC1) +;; Date: Fri 7-Apr-2006 ;; Keywords: hypermedia ;; Author: John Wiegley (johnw AT gnu DOT org) ;; Maintainer: Michael Olson (mwolson AT gnu DOT org) @@ -45,7 +45,7 @@ ;;; Code: -(defvar muse-version "3.02.6" +(defvar muse-version "3.02.90" "The version of Muse currently loaded") (defun muse-version (&optional insert) @@ -83,7 +83,8 @@ This is autogenerated from `muse-ignored-extensions'.") (defun muse-update-file-extension (sym val) "Update the value of `muse-file-extension'." - (when (and (boundp sym) (symbol-value sym)) + (when (and (boundp sym) (symbol-value sym) + (featurep 'muse-mode)) ;; remove old auto-mode-alist association (setq auto-mode-alist (delete (cons (concat "\\." (symbol-value sym) "\\'") @@ -91,7 +92,7 @@ This is autogenerated from `muse-ignored-extensions'.") auto-mode-alist))) (set sym val) ;; associate .muse with muse-mode - (when val + (when (and val (featurep 'muse-mode)) (add-to-list 'auto-mode-alist (cons (concat "\\." val "\\'") 'muse-mode-choose-mode))) diff --git a/muse.texi b/muse.texi index eec22fe..d1942be 100644 --- a/muse.texi +++ b/muse.texi @@ -12,7 +12,7 @@ @syncodeindex fn cp @copying -This manual is for the Emacs Muse version 3.02.6. +This manual is for the Emacs Muse version 3.02.90 (3.03 RC1). Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc. -- 2.11.4.GIT