Your message dated Thu, 27 Nov 2014 17:49:38 +0100
with message-id <[email protected]>
and subject line Re: Bug#771029: unblock: emacs-calfw/1.3+git20141031-2
has caused the Debian Bug report #771029,
regarding unblock: emacs-calfw/1.3+git20141031-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
771029: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771029
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock

Dear release team,

Please unblock package emacs-calfw, which fixes RC
installation bug.


But it's not straightforward, though testing has the
version 1.3+git20141005-1, unstable has already the
version 1.3+git20141031-1 (I couldn't make  it on time).

I'm unsure about the case, so for now I've staged fix for "unstable" version
into mentors, which include 2 upstream bug fixes in addition to RC fix,
http://mentors.debian.net/debian/pool/main/e/emacs-calfw/emacs-calfw_1.3+git20141031-2.dsc

and it seems reasonably small changes.
 - 
https://github.com/kiwanami/emacs-calfw/commit/ee771f7b1ef4a3938cd02281e5e1f1fc4aebc5e7
 - 
https://github.com/kiwanami/emacs-calfw/commit/4307ea34ddabeb3aad11bef1e0633f02c13917bf

If it is OK, then I will put this into unstable, otherwise
I will retry to adjust for "testing" version.

The debdiff against version 1.3+git20141005-1 in testing is
as follows:

--
diff -Nru emacs-calfw-1.3+git20141005/calfw-cal.el 
emacs-calfw-1.3+git20141031/calfw-cal.el
--- emacs-calfw-1.3+git20141005/calfw-cal.el    2014-10-05 20:23:53.000000000 
+0900
+++ emacs-calfw-1.3+git20141031/calfw-cal.el    2014-10-31 00:13:02.000000000 
+0900
@@ -89,11 +89,33 @@
 (defun cfw:cal-schedule-period-to-calendar (begin end)
   "[internal] Return calfw calendar items between BEGIN and END
 from the diary schedule data."
-  (loop
-   for (date string . rest) in (diary-list-entries
-                                begin
-                                (1+ (cfw:days-diff begin end)) t)
-   collect (cfw:cal-entry-to-event date string)))
+  (let ((all (diary-list-entries
+             begin
+             (1+ (cfw:days-diff begin end)) t))
+       non-periods
+       periods)
+    (while all
+      (let ((date-spec (caddar all)))
+       (if (string-match "%%(diary-block" date-spec)
+           (or (assoc date-spec periods)
+               (setq periods (acons date-spec (cadar all) periods)))
+         (setq non-periods (cons (car all) non-periods))))
+      (setq all (cdr all)))
+    (append
+     (loop
+      for (date string . rest) in non-periods
+      collect (cfw:cal-entry-to-event date string))
+     (list (cons 'periods
+                (map 'list (function (lambda (period)
+                                      (let ((spec (read (substring (car 
period) 2))))
+                                        (list (list (nth 1 spec)
+                                                    (nth 2 spec)
+                                                    (nth 3 spec))
+                                              (list (nth 4 spec)
+                                                    (nth 5 spec)
+                                                    (nth 6 spec))
+                                              (cdr period)))))
+                     periods))))))

 (defvar cfw:cal-schedule-map
   (cfw:define-keymap
diff -Nru emacs-calfw-1.3+git20141005/calfw.el 
emacs-calfw-1.3+git20141031/calfw.el
--- emacs-calfw-1.3+git20141005/calfw.el        2014-10-05 20:23:53.000000000 
+0900
+++ emacs-calfw-1.3+git20141031/calfw.el        2014-10-31 00:13:02.000000000 
+0900
@@ -1165,10 +1165,6 @@
 calling functions `:data' function."
   (cond
    ((null sources) nil)
-   ((= 1 (length sources))
-    (cfw:contents-put-source
-     (funcall (cfw:source-data (car sources)) begin end)
-     (car sources)))
    (t
     (loop for s in sources
           for f = (cfw:source-data s)
diff -Nru emacs-calfw-1.3+git20141005/debian/changelog 
emacs-calfw-1.3+git20141031/debian/changelog
--- emacs-calfw-1.3+git20141005/debian/changelog        2014-10-22 
14:01:03.000000000 +0900
+++ emacs-calfw-1.3+git20141031/debian/changelog        2014-11-26 
09:05:29.000000000 +0900
@@ -1,3 +1,16 @@
+emacs-calfw (1.3+git20141031-2) unstable; urgency=medium
+
+  * fix RC installation bug. (Closes: #769514)
+    - emacsen-install script now checks dependency elisps.
+
+ -- KURASHIKI Satoru <[email protected]>  Wed, 26 Nov 2014 09:02:43 +0900
+
+emacs-calfw (1.3+git20141031-1) unstable; urgency=medium
+
+  * sync with upstream git repostiory.
+
+ -- KURASHIKI Satoru <lurdan@@gmail.com>  Sat, 31 Oct 2014 23:52:45 +0900
+
 emacs-calfw (1.3+git20141005-1) unstable; urgency=medium

   * sync with upstream git repository.
diff -Nru emacs-calfw-1.3+git20141005/debian/emacs-calfw-howm.emacsen-install 
emacs-calfw-1.3+git20141031/debian/emacs-calfw-howm.emacsen-install
--- emacs-calfw-1.3+git20141005/debian/emacs-calfw-howm.emacsen-install 
2014-03-30 12:31:59.000000000 +0900
+++ emacs-calfw-1.3+git20141031/debian/emacs-calfw-howm.emacsen-install 
2014-11-26 09:02:34.000000000 +0900
@@ -11,6 +11,8 @@
 if [ ${FLAVOR} = emacs ]; then exit 0; fi
 if [ ${FLAVOR} = emacs20 -o ${FLAVOR} = emacs21 -o ${FLAVOR} = emacs22 -o 
${FLAVOR} = emacs23 ]; then exit 0; fi
 if [ ${FLAVOR} = xemacs20 -o ${FLAVOR} = xemacs21 ]; then exit 0; fi
+if [ ! -f "/usr/share/${FLAVOR}/site-lisp/emacs-calfw/calfw.elc" ]; then exit 
0; fi
+if [ ! -f "/usr/share/${FLAVOR}/site-lisp/howm/howm.elc" ]; then exit 0; fi

 echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}

unblock emacs-calfw/1.3+git20141031-2

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-30-pve (SMP w/8 CPU cores)
Locale: LANG=C, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

--- End Message ---
--- Begin Message ---
On 2014-11-27 17:37, Satoru KURASHIKI wrote:
> hi,
> 
> On Thu, Nov 27, 2014 at 3:38 AM, Niels Thykier <[email protected]> wrote:
>> To be honest, the 4307ea34 commit smells more like a feature than a bug
>> fix at first glance.  Anyhow, please go ahead and let us know once it
>> has been uploaded to unstable.
> 
> Excuse me, (a bit) incorrect expression. I had seen them as a set of 
> improvement
> for displaying diary...
> 
> Anyway, thanks, I've uploaded the package into unstable.
> 
> regards,
> 

Unblocked, thanks.

~Niels

--- End Message ---

Reply via email to