From: John Sullivan <johnsu01@wjsullivan.net>
Date: Sun, 18 May 2008 18:08:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://repo.or.cz/srv/git/planner-el
X-Git-Tag: v3.42~1
X-Git-Url: https://repo.or.cz/w/planner-el.git/commitdiff_plain/2978fce17d7ccabfdbcc3454656c33e7aa97f4ce

Merge branch 'master' of ssh://repo.or.cz/srv/git/planner-el

Conflicts:

	ChangeLog
	Makefile.defs.default
---

2978fce17d7ccabfdbcc3454656c33e7aa97f4ce
diff --cc ChangeLog
index 410086b,cdc505a..bb95b10
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,21 +1,25 @@@
- 2008-04-01  John Sullivan  <john@wjsullivan.net>
++2008-05-18  John Sullivan  <john@wjsullivan.net>
 +
 +	* Release Planner 3.42.
 +
+ 2008-04-26  Michael Olson  <mwolson@gnu.org>
+ 
+ 	* planner.el (planner-copy-or-move-region): Make sure that the
+ 	very first task in a region is acted on exactly once.  The old
+ 	behavior was that the first task would be skipped.
+ 
+ 2008-04-16  Michael Olson  <mwolson@gnu.org>
+ 
+ 	* Makefile (distclean): Don't bother removing debian files.
+ 	(debclean, debprepare, debbuild, debinstall, deb): Remove obsolete
+ 	targets.
+ 
+ 	* Makefile.defs.default (DEBNAME, LASTUPLOAD, BUILDOPTS)
+ 	(DISTRIBUTOR): Remove obsolete variables.
+ 
+ 	* planner.el (planner-annotation-from-wiki): Use "::" instead of
+ 	"#" as the project/page delimiter.
+ 
  2008-02-24  Michael Olson  <mwolson@gnu.org>
  
  	* planner-report.el (planner-report-generate): Use
diff --cc Makefile.defs.default
index 3c40ce5,c28ad14..b95da42
--- a/Makefile.defs.default
+++ b/Makefile.defs.default
@@@ -35,12 -35,8 +35,9 @@@ install_info = install-info --info-dir=
  
  # Useful only for the maintainer
  PROJECT    = planner
 -VERSION    = 3.41
 +DEBNAME    = planner-el
 +VERSION    = 3.42
  MANUAL     = planner-el
- LASTUPLOAD = 3.40.arch.50
- BUILDOPTS  =
- DISTRIBUTOR = debian
  
  # Location of Emacs Lisp Package Archive entries
  ELPADIR  = ../../elpa