Package: bsdmainutils
Version: 9.0.3
Severity: normal
Tags: patch
Dear Maintainer,
$ calendar -A300 -B300 -f /usr/share/calendar/calendar.judaic
# vi /usr/share/calendar/calendar.judiac
(remove two spaces, and replace with a tab on any line)
$ calendar -A300 -B300 -f /usr/share/calendar/calendar.judaic
Sep 29* Parshat Ha'Aninu
# apt-get install python-hdate
$ python <( zcat /usr/share/doc/bsdmainutils/calendarJudaic.py.gz ) >
calendar.judaic
$ calendar -A300 -B300 -f calendar.judaic
$ [apply my patch]
$ calendar -A10 -B10 -f calendar.judaic
[Output]
.
.
.
[Output]
The output of the current version of calendarJudaic.py does not conform
to the format which calendar expects and all lines are neglected.
The patch applies cleanly to origin/master as of today (4ec6e5f).
-- System Information:
Debian Release: 7.6
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages bsdmainutils depends on:
ii bsdutils 1:2.20.1-5.3
ii debianutils 4.3.2
ii libc6 2.13-38+deb7u4
ii libncurses5 5.9-10
ii libtinfo5 5.9-10
bsdmainutils recommends no packages.
Versions of packages bsdmainutils suggests:
ii cpp 4:4.7.2-1
pn vacation <none>
ii wamerican [wordlist] 7.1-1
ii whois 5.1.1~deb7u1
-- no debconf information
>From 4e317d4c4bf00c59e47f88b17b6583ae01cf56df Mon Sep 17 00:00:00 2001
From: Robbin Edgren <[email protected]>
Date: Mon, 29 Sep 2014 09:14:19 +0200
Subject: [PATCH] Judaic calendars must conform to calendar format.
The man page of calendar states:
Day descriptions start after the first <tab>
character in the line; if the line does not
contain a <tab> character, it isn't printed
out.
However, the output of calendarJudaic.py doesn't have a
tabulator but two spaces instead. This patch fixes that.
---
debian/calendarJudaic.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/calendarJudaic.py b/debian/calendarJudaic.py
index 91f4bfe..d4c9639 100644
--- a/debian/calendarJudaic.py
+++ b/debian/calendarJudaic.py
@@ -127,23 +127,23 @@ LANG=UTF-8
parasha['diaspora'] = h.get_parasha_string(0)
if holyday['Israel']:
if holyday['Israel'] == holyday['diaspora']:
- print "%02d/%02d* %s" % (day, month, holyday['Israel'])
+ print "%02d/%02d* %s" % (day, month, holyday['Israel'])
else:
- print "%02d/%02d* %s (Israel only)" % \
+ print "%02d/%02d* %s (Israel only)" % \
(day, month, holyday['Israel'])
elif holyday['diaspora']:
- print "%02d/%02d* %s (diaspora only)" % \
+ print "%02d/%02d* %s (diaspora only)" % \
(day, month, holyday['diaspora'])
if parasha['Israel'] and parasha['Israel'] != 'none':
if parasha['Israel'] == parasha['diaspora']:
- print "%02d/%02d* Parshat %s" % \
+ print "%02d/%02d* Parshat %s" % \
(day, month, parasha['Israel'])
else:
- print "%02d/%02d* %s (Israel only)" % \
+ print "%02d/%02d* %s (Israel only)" % \
(day, month, parasha['Israel'])
elif parasha['diaspora'] and parasha['diaspora'] != 'none':
# See http://bugs.debian.org/583092 why 'none' is required here.
- print "%02d/%02d* Parshat %s (diaspora only)" % \
+ print "%02d/%02d* Parshat %s (diaspora only)" % \
(day, month, parasha['diaspora'])
print footer
--
1.9.1
