From 8e45ee2a9264f0160f3fdfa0ebf9312781b41886 Mon Sep 17 00:00:00 2001
From: "Michael W. Olson" <mwolson@gnu.org>
Date: Thu, 16 Aug 2007 17:55:55 -0400
Subject: [PATCH] Release Emacs Muse 3.10

* Release Emacs Muse 3.10.

* Makefile (dist, debprepare): Pass HEAD argument to git-archive.
  (upload): Don't depend on release rule.
---
 ChangeLog             | 5 +++++
 Makefile              | 6 +++---
 Makefile.defs.default | 4 ++--
 lisp/muse.el          | 6 +++---
 texi/muse.texi        | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 315e77c..68dde77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-08-16  Michael Olson  <mwolson@gnu.org>
 
+	* Release Emacs Muse 3.10.
+
+	* Makefile (dist, debprepare): Pass HEAD argument to git-archive.
+	(upload): Don't depend on release rule.
+
 	* NEWS: Document remaining changes.
 
 2007-08-15  Michael Olson  <mwolson@gnu.org>
diff --git a/Makefile b/Makefile
index 3880983..ee90185 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ distclean:
 	-rm -fr ../$(PROJECT)-$(VERSION)
 
 dist: autoloads distclean
-	git archive --format=tar --prefix=$(PROJECT)-$(VERSION)/ | \
+	git archive --format=tar --prefix=$(PROJECT)-$(VERSION)/ HEAD | \
 	  (cd .. && tar xf -)
 	cp lisp/$(PROJECT)-autoloads.el ../$(PROJECT)-$(VERSION)/lisp
 
@@ -82,7 +82,7 @@ debprepare:
 	(cd .. && tar -czf $(DEBNAME)_$(VERSION).orig.tar.gz \
 	    $(DEBNAME)-$(VERSION))
 	(cd debian && git archive --format=tar \
-	  --prefix=$(DEBNAME)-$(VERSION)/debian/ | \
+	  --prefix=$(DEBNAME)-$(VERSION)/debian/ HEAD | \
 	  (cd ../.. && tar xf -))
 
 debbuild:
@@ -102,7 +102,7 @@ debinstall:
 
 deb: debclean debprepare debbuild debinstall
 
-upload: release
+upload:
 	(cd .. && \
 	  scp $(PROJECT)-$(VERSION).zip* $(PROJECT)-$(VERSION).tar.gz* \
 	    mwolson@download.gna.org:/upload/muse-el)
diff --git a/Makefile.defs.default b/Makefile.defs.default
index 5ed45e0..2de5d31 100644
--- a/Makefile.defs.default
+++ b/Makefile.defs.default
@@ -36,9 +36,9 @@ install_info = install-info --info-dir=$(INFODIR) $(1) || :
 # Useful only for the maintainer
 PROJECT     = muse
 DEBNAME     = muse-el
-VERSION     = 3.03
+VERSION     = 3.10
 MANUAL      = muse
-LASTUPLOAD  = 3.02.8-1
+LASTUPLOAD  = 3.03-1
 BUILDOPTS   =
 DISTRIBUTOR = debian
 
diff --git a/lisp/muse.el b/lisp/muse.el
index 312c2cb..471e788 100644
--- a/lisp/muse.el
+++ b/lisp/muse.el
@@ -4,8 +4,8 @@
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: muse.el
-;; Version: 3.03
-;; Date: Sun 17-Jun-2007
+;; Version: 3.10
+;; Date: Thu 16-Aug-2007
 ;; Keywords: hypermedia
 ;; Author: John Wiegley (johnw AT gnu DOT org)
 ;; Maintainer: Michael Olson <mwolson@gnu.org>
@@ -48,7 +48,7 @@
 ;; Indicate that this version of Muse supports nested tags
 (provide 'muse-nested-tags)
 
-(defvar muse-version "3.03"
+(defvar muse-version "3.10"
   "The version of Muse currently loaded")
 
 (defun muse-version (&optional insert)
diff --git a/texi/muse.texi b/texi/muse.texi
index dac42bb..c88219a 100644
--- a/texi/muse.texi
+++ b/texi/muse.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for Emacs Muse version 3.03.
+This manual is for Emacs Muse version 3.10.
 
 Copyright @copyright{} 2004, 2005, 2006,
 2007 Free Software Foundation, Inc.
-- 
2.11.4.GIT