From 05f1b1aa66a8ad1f8d505988391a0836bd2c6f03 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Tue, 17 Jan 2006 03:50:43 +0000 Subject: [PATCH] Merged from mwolson@gnu.org--2005 (patch 354) Patches applied: * mwolson@gnu.org--2005/muse--main--1.0--patch-354 Post-release updates. git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-56 --- AUTHORS | 4 ++-- ChangeLog | 27 +++++++++++++++++++++++++++ ChangeLog.main | 37 +++++++++++++++++++++++++++++++++++++ Makefile | 10 +++++----- Makefile.defs | 4 ++-- debian/{NEWS => NEWS.Debian} | 0 debian/changelog | 11 +++++++++++ debian/copyright | 14 +++++++++++++- debian/emacsen-install | 2 +- debian/emacsen-startup | 7 +++---- debian/rules | 3 ++- lisp/Makefile | 4 ++-- lisp/muse.el | 2 +- 13 files changed, 106 insertions(+), 19 deletions(-) rename debian/{NEWS => NEWS.Debian} (100%) diff --git a/AUTHORS b/AUTHORS index 69df20a..77fc08b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -26,7 +26,7 @@ Yann Hodique: Contributor, author of muse-wiki.el Peter K. Lee: Contributor, muse-xml.el: Ideas and markup strings taken. muse-publish.el: 11 lines changed. - (assignment pending) + (assigned past and future changes) Phillip Lord: Contributor, muse-colors.el: 3 lines changed. @@ -40,7 +40,7 @@ Dale P. Smith: Contributor (disclaimed changes to Emacs) John Sullivan: Contributor -- documentation - (employed by FSF) + (assigned past and future changes) Ganesh Swami: Original author of muse-latex2png.el (assignment pending) diff --git a/ChangeLog b/ChangeLog index 35cdcad..bb12096 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,33 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--rel--3.02 # +2006-01-17 03:50:43 GMT Michael Olson patch-56 + + Summary: + Merged from mwolson@gnu.org--2005 (patch 354) + Revision: + muse--rel--3.02--patch-56 + + Patches applied: + + * mwolson@gnu.org--2005/muse--main--1.0--patch-354 + Post-release updates. + + modified files: + AUTHORS ChangeLog ChangeLog.main Makefile Makefile.defs + debian/changelog debian/copyright debian/emacsen-install + debian/emacsen-startup debian/rules lisp/Makefile lisp/muse.el + + renamed files: + debian/.arch-ids/NEWS.id + ==> debian/.arch-ids/NEWS.Debian.id + debian/NEWS + ==> debian/NEWS.Debian + + new patches: + mwolson@gnu.org--2005/muse--main--1.0--patch-354 + + 2006-01-13 03:32:18 GMT Michael Olson patch-55 Summary: diff --git a/ChangeLog.main b/ChangeLog.main index ea9dff4..546ec8d 100644 --- a/ChangeLog.main +++ b/ChangeLog.main @@ -2,6 +2,43 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2006-01-17 02:08:48 GMT Michael Olson patch-354 + + Summary: + Post-release updates. + Revision: + muse--main--1.0--patch-354 + + * AUTHORS: Update assignments. + + * Makefile (release): Sign files here, rather than just before upload. + + * debian/copyright: Update. + + * debian/emacsen-install (FILES): Filter out autoloads. + + * debian/emacsen-startup: Load autoload file. + + * rules (build-stamp): Make autoloads. + (install): Install NEWS properly. + + * lisp/Makefile: Make sure autoloads get generated upon install. + + * lisp/muse.el (muse-version): Change to version 3.02.6. Oops. Thanks + to Romain Francoise for spotting this. + + modified files: + AUTHORS ChangeLog Makefile debian/copyright + debian/emacsen-install debian/emacsen-startup debian/rules + lisp/Makefile lisp/muse.el + + renamed files: + debian/.arch-ids/NEWS.id + ==> debian/.arch-ids/NEWS.Debian.id + debian/NEWS + ==> debian/NEWS.Debian + + 2006-01-11 22:08:16 GMT Michael Olson patch-351 Summary: diff --git a/Makefile b/Makefile index 81ab6bc..b09f02d 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ include Makefile.defs SUBDIRS = lisp examples experimental -all: lisp muse.info +all: autoloads lisp muse.info lisp: (cd lisp && $(MAKE)) @@ -60,7 +60,9 @@ dist: distclean release: dist (cd .. && tar -czf muse-$(VERSION).tar.gz muse-$(VERSION) ; \ - zip -r muse-$(VERSION).zip muse-$(VERSION)) + zip -r muse-$(VERSION).zip muse-$(VERSION) && \ + gpg --detach muse-$(VERSION).tar.gz && \ + gpg --detach muse-$(VERSION).zip) debbuild: (cd ../muse-el-$(VERSION) && \ @@ -92,7 +94,5 @@ debrelease: dist $(MAKE) debbuild upload: release - (cd .. && gpg --detach muse-$(VERSION).tar.gz && \ - gpg --detach muse-$(VERSION).zip && \ - scp muse-$(VERSION).zip* muse-$(VERSION).tar.gz* \ + (cd .. && scp muse-$(VERSION).zip* muse-$(VERSION).tar.gz* \ mwolson@download.gna.org:/upload/muse-el) diff --git a/Makefile.defs b/Makefile.defs index 294af60..b8f8822 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 -LASTUPLOAD = 3.02.5-1 +VERSION = 3.02.6a +LASTUPLOAD = 3.02.6-1 BUILDOPTS = diff --git a/debian/NEWS b/debian/NEWS.Debian similarity index 100% rename from debian/NEWS rename to debian/NEWS.Debian diff --git a/debian/changelog b/debian/changelog index f510af2..a12b354 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +muse-el (3.02.6-2) unstable; urgency=low + + * Update copyright data. + * Bump `muse-version' up to 3.02.6. Thanks to Romain Francoise for + spotting this. + * debian/emacsen-install, debian/emacsen-statup: Use autoload file. + * debian/rules: (build-stamp): Make autoloads. + (install): Install NEWS properly. + + -- Michael W. Olson (GNU address) Mon, 16 Jan 2006 21:28:57 -0500 + muse-el (3.02.6-1) unstable; urgency=low * New upstream release. diff --git a/debian/copyright b/debian/copyright index f372bf3..62bf336 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,18 +6,30 @@ http://www.mwolson.org/projects/MuseMode.html Upstream Authors: John Wiegley Michael Olson + Trent Buck Sacha Chua Brad Collins Li Daobing + Bastien Guerry Yann Hodique + Andrew J. Korty + Peter K. Lee + Na Li + Phillip Lord + Chris Lowis + Jim Ottaway Andrea Riciputi + Dale P. Smith John Sullivan + Ganesh Swami + G. J. Teale Gary Vaughan + Sergey Vlasov Lan Yufeng Copyright: - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/emacsen-install b/debian/emacsen-install index 9ac3eae..6af750d 100644 --- a/debian/emacsen-install +++ b/debian/emacsen-install @@ -32,7 +32,7 @@ ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} install -m 755 -d ${ELCDIR} cd ${ELDIR} -FILES=`echo *.el` +FILES=`ls -1 *.el | grep -v autoloads` rm -f ${ELCDIR}/*.el cp ${FILES} ${ELCDIR} cd ${ELCDIR} diff --git a/debian/emacsen-startup b/debian/emacsen-startup index fe0d442..1040652 100644 --- a/debian/emacsen-startup +++ b/debian/emacsen-startup @@ -16,8 +16,7 @@ (when (fboundp 'debian-pkg-add-load-path-item) (debian-pkg-add-load-path-item (concat "/usr/share/" (symbol-name flavor) - "/site-lisp/muse-el"))) + "/site-lisp/muse-el")) + (debian-pkg-add-load-path-item "/usr/share/emacs/site-lisp/muse-el")) -(autoload 'muse-use-font-lock "muse-colors") -(autoload 'muse-mode "muse-mode" nil t) -(autoload 'muse-latex-transform "muse-convert" nil t) +(load "muse-autoloads.el") diff --git a/debian/rules b/debian/rules index 60c3592..f8e7bce 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,7 @@ build-stamp: makeinfo muse.texi makeinfo --html --output=html muse.texi # Add here commands to compile the package. + $(MAKE) autoloads $(MAKE) examples #/usr/bin/docbook-to-man debian/muse.sgml > muse.1 @@ -57,7 +58,7 @@ install: build # Other documentation install -m 0644 AUTHORS ${PKGDIR}${DOCDIR}/AUTHORS - install -m 0644 debian/NEWS ${PKGDIR}${DOCDIR}/NEWS.Debian + install -m 0644 NEWS ${PKGDIR}${DOCDIR}/NEWS install -m 0644 README ${PKGDIR}${DOCDIR}/README install -m 0644 ChangeLog ${PKGDIR}${DOCDIR}/changelog cat ChangeLog.2004 >> ${PKGDIR}${DOCDIR}/changelog diff --git a/lisp/Makefile b/lisp/Makefile index bc72157..2db4c85 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -29,9 +29,9 @@ clean: realclean distclean fullclean: clean -rm -f muse-autoloads.el -install: $(ELC) +install: autoloads lisp install -d $(ELISPDIR) - install -m 0644 $(EL) $(ELC) $(ELISPDIR) + install -m 0644 muse-autoloads.el $(EL) $(ELC) $(ELISPDIR) test: $(ELC) $(EMACS) -q $(SITEFLAG) -batch -l ../scripts/muse-build.el \ diff --git a/lisp/muse.el b/lisp/muse.el index 48b53db..e3b433d 100644 --- a/lisp/muse.el +++ b/lisp/muse.el @@ -45,7 +45,7 @@ ;;; Code: -(defvar muse-version "3.02.5" +(defvar muse-version "3.02.6" "The version of Muse currently loaded") (defun muse-version (&optional insert) -- 2.11.4.GIT