From 9d8f25fbb2a0eac7b4628231c2e082292ca9eee7 Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Sat, 8 Apr 2006 03:00:29 +0000
Subject: [PATCH] Merged from mwolson@gnu.org--2006 (patch 31)

Patches applied:

 * mwolson@gnu.org--2006/planner--main--1.0--patch-31
   Prepare new Debian package for Arch snapshot.

git-archimport-id: mwolson@gnu.org--2006-planner-el/planner-el--devel--0--patch-28
---
 ChangeLog.2006   | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.defs    |  4 ++--
 debian/changelog | 10 +++++++++
 3 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.2006 b/ChangeLog.2006
index 071d41f..e5da278 100644
--- a/ChangeLog.2006
+++ b/ChangeLog.2006
@@ -1,3 +1,71 @@
+2006-04-08 01:34:44 GMT	Michael Olson <mwolson@gnu.org>	patch-30
+
+    Summary:
+      planner-registry: Minor code cleanup.
+    Revision:
+      planner--main--1.0--patch-30
+
+    * planner-registry.el (planner-registry-show): Remove boundp check.
+
+    modified files:
+     planner-registry.el
+
+
+2006-04-08 01:32:20 GMT	Michael Olson <mwolson@gnu.org>	patch-29
+
+    Summary:
+      Include planner-registry.el.
+    Revision:
+      planner--main--1.0--patch-29
+
+    * planner-registry.el: New file that implements a registry of URLs and
+      Planner annotations.  This used to be called muse-registry.el, but it
+      has been renamed to planner-registry.el since it fits better with
+      Planner.
+
+    new files:
+     .arch-ids/planner-registry.el.id planner-registry.el
+
+    modified files:
+     AUTHORS
+
+
+2006-04-02 18:20:31 GMT	Michael Olson <mwolson@gnu.org>	patch-28
+
+    Summary:
+      Correct several regexps.
+    Revision:
+      planner--main--1.0--patch-28
+
+    If a regexp has a character set negation, make sure it includes the
+    newline, so that newlines aren't matched.
+
+    modified files:
+     planner-appt.el planner-bibtex.el planner-deadline.el
+     planner-erc.el planner-id.el planner-mhe.el planner-rdf.el
+     planner-tasks-overview.el planner-timeclock.el planner-vm.el
+     planner.el
+
+
+2006-03-29 20:23:27 GMT	Andrew J. Korty <ajk@iu.edu>	patch-25
+
+    Summary:
+      Merge some authz fixes.
+    Revision:
+      planner--main--1.0--patch-27
+
+    * planner-authz.el (planner-authz-fix-list-item): new function to move
+      the <li> tags to the inside to avoid a blank bullet when a list item is
+      totally access controlled
+      (planner-authz-markup-regexps): use it
+      (planner-authz-index-as-string): use <authz> tags to mark up the index
+      and rely on the new regexp entry to clean up the results
+      (planner-authz-multi-union): declare `sublist'
+
+    modified files:
+     planner-authz.el
+
+
 2006-03-27 23:52:31 GMT	Michael Olson <mwolson@gnu.org>	patch-25
 
     Summary:
diff --git a/Makefile.defs b/Makefile.defs
index a897f0a..6d09d10 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -18,7 +18,7 @@ INSTALLINFO = install-info --info-dir=$(INFODIR)
 # Useful only for the maintainer
 PROJECT    = planner
 DEBNAME    = planner-el
-VERSION    = 3.40
+VERSION    = 3.40.arch.31
 MANUAL     = planner-el
-LASTUPLOAD = 3.40-2
+LASTUPLOAD = 3.40-3
 BUILDOPTS  =
diff --git a/debian/changelog b/debian/changelog
index 8d66ba1..61787df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+planner-el (3.40.arch.31-1) unstable; urgency=low
+
+  * New Arch snapshot.
+  * Bug fix: "planner-el: 'C-c C-p' chokes", thanks to LI Daobing (Closes:
+    #350515).
+  * Bug fix: "planner-el: remember integration failing?", thanks to Daniel
+    Martins (Closes: #328681).
+
+ -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Fri,  7 Apr 2006 22:53:01 -0400
+
 planner-el (3.40-3) unstable; urgency=low
 
   * Acknowledge NMU: "planner-el: FTBFS: Missing Build-Depends on 'emacs21'",
-- 
2.11.4.GIT