Bug#859933: bsdmainutils: diff for NMU 9.0.12+nmu1

[Thorsten Glaser]

Hi,

the NMU debdiff is attached.

Thanks,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg
diff -Nru bsdmainutils-9.0.12/debian/changelog 
bsdmainutils-9.0.12+nmu1/debian/changelog
--- bsdmainutils-9.0.12/debian/changelog        2016-10-25 11:05:53.000000000 
+0200
+++ bsdmainutils-9.0.12+nmu1/debian/changelog   2017-04-12 13:22:14.000000000 
+0200
@@ -1,3 +1,10 @@
+bsdmainutils (9.0.12+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix one newline too much in patch. (Closes: #859933)
+
+ -- Thorsten Glaser <t...@mirbsd.de>  Wed, 12 Apr 2017 13:22:14 +0200
+
 bsdmainutils (9.0.12) unstable; urgency=medium
 
   * Made hexdump work with length arguments greater than 2^31. (Closes: 
#841454)
@@ -373,7 +380,7 @@
   * Patched new calendar sources to use wide-character functions.
   * Created patch to put Debian specific options back into calendar
     tool. (Closes: #293689)
-  * Updated all calendars from their FreeBSD sources. 
+  * Updated all calendars from their FreeBSD sources.
     (Closes: #388153, #413900, #446547, #542229)
   * Added/Fixed some calendar entries as reported by Debian users.
     (Closes: #554561, #337311, #525925, #493759, #381114, #280176))
diff -Nru bsdmainutils-9.0.12/debian/patches/calendar_wcs.diff 
bsdmainutils-9.0.12+nmu1/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+nmu1/debian/patches/calendar_wcs.diff   2017-04-12 
13:22:05.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;