Package: bsdmainutils
Version: 9.0.12
Severity: important
Tags: patch

Since an upgrade from jessie to stretch, calendar(1) output
has double newlines, irritating many a user. The fix is trivial
and probably a merge mistake in a patch.

-- System Information:
Debian Release: 9.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/lksh
Init: sysvinit (via /sbin/init)

Versions of packages bsdmainutils depends on:
ii  bsdutils     1:2.29.2-1
ii  debianutils  4.8.1.1
ii  libbsd0      0.8.3-1
ii  libc6        2.24-9
ii  libncurses5  6.0+20161126-1
ii  libtinfo5    6.0+20161126-1

bsdmainutils recommends no packages.

Versions of packages bsdmainutils suggests:
ii  cpp                  4:6.3.0-2
pn  vacation             <none>
ii  wbritish [wordlist]  7.1-1
ii  whois                5.2.15
ii  wogerman [wordlist]  1:2-31

-- no debconf information
diff -Nru bsdmainutils-9.0.12/debian/changelog 
bsdmainutils-9.0.12+nmu0teckids1/debian/changelog
--- bsdmainutils-9.0.12/debian/changelog        2016-10-25 11:05:53.000000000 
+0200
+++ bsdmainutils-9.0.12+nmu0teckids1/debian/changelog   2017-04-09 
13:56:02.000000000 +0200
@@ -1,3 +1,10 @@
+bsdmainutils (9.0.12+nmu0teckids1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix one newline too much in patch.
+
+ -- Thorsten Glaser <[email protected]>  Sun, 09 Apr 2017 13:56:02 +0200
+
 bsdmainutils (9.0.12) unstable; urgency=medium
 
   * Made hexdump work with length arguments greater than 2^31. (Closes: 
#841454)
diff -Nru bsdmainutils-9.0.12/debian/patches/calendar_wcs.diff 
bsdmainutils-9.0.12+nmu0teckids1/debian/patches/calendar_wcs.diff
--- bsdmainutils-9.0.12/debian/patches/calendar_wcs.diff        2016-10-25 
10:42:38.000000000 +0200
+++ bsdmainutils-9.0.12+nmu0teckids1/debian/patches/calendar_wcs.diff   
2017-04-09 13:55:58.000000000 +0200
@@ -546,7 +546,7 @@
                                                        err(1, NULL);
                                                cur_evt->desc = 
&(cur_evt->ldesc);
                                                ev1 = cur_evt;
-@@ -193,16 +240,20 @@
+@@ -193,16 +240,19 @@
                                }
                        }
                } else if (printing) {
@@ -567,7 +567,6 @@
        while (tmp) {
 -              (void)fprintf(fp, "%s%s\n", tmp->print_date, *(tmp->desc));
 +              (void)fprintf(fp, "%ls%ls\n", tmp->print_date, *(tmp->desc));
-+              (void)fprintf(fp, "\n");
                tmp = tmp->next;
        }
        tmp = events;

Reply via email to