From 83c9dd8d115e2bdd9717af4231686edda3687877 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Fri, 14 Aug 2015 11:40:51 +0200 Subject: [PATCH] New upstream release which incorporated patches 02_fix-manpage and 727245. --- debian/changelog | 6 ++++++ debian/patches/02_fix-manpage | 31 ----------------------------- debian/patches/03_datafile-f-switch | 2 +- debian/patches/727245.diff | 18 ----------------- debian/patches/series | 2 -- 5 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 debian/patches/02_fix-manpage delete mode 100644 debian/patches/727245.diff diff --git a/debian/changelog b/debian/changelog index 7c2a4e7..a1570ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +abook (0.6.1-1) unstable; urgency=medium + + * New upstream release which incorporated patches 02_fix-manpage and 727245. + + -- Rhonda D'Vine Fri, 14 Aug 2015 11:34:47 +0200 + abook (0.6.0~pre2-5) unstable; urgency=low * fix error into debian/postinst file (Closes: #791803). diff --git a/debian/patches/02_fix-manpage b/debian/patches/02_fix-manpage deleted file mode 100644 index da2d5c1..0000000 --- a/debian/patches/02_fix-manpage +++ /dev/null @@ -1,31 +0,0 @@ -Author: Gerfried Fuchs vim:ft=diff: -Description: Escape hyphens in manpage where they mean the minus sign - ---- a/abook.1 -+++ b/abook.1 -@@ -82,11 +82,11 @@ The following \fIoutputformats\fR are su - .br - - \fBbsdcal\fP BSD calendar - .TP --\fB\-\-add-email\fP -+\fB\-\-add\-email\fP - Read an e-mail message from stdin and add the sender to the addressbook. - .TP --\fB\-\-add-email-quiet\fP --Same as --add-email but doesn't confirm adding. -+\fB\-\-add\-email\-quiet\fP -+Same as \-\-add\-email but doesn't confirm adding. - .TP - \fB\-\-formats\fP - List available formats. ---- a/abookrc.5 -+++ b/abookrc.5 -@@ -90,7 +90,7 @@ Defines the way entries are displayed in - \fI{name:22}\fP - displays the \fIname\fP field with a maximal width of 22 characters. - .TP --\fI{phone:-13|workphone|mobile}\fP -+\fI{phone:\-13|workphone|mobile}\fP - displays (right aligned within a width of 13 characters), either the \fIphone\fP, \fIworkphone\fP or \fImobile\fP field, whichever being the first to be non-empty. - .RE - .IP diff --git a/debian/patches/03_datafile-f-switch b/debian/patches/03_datafile-f-switch index 5fd609e..90bec8d 100644 --- a/debian/patches/03_datafile-f-switch +++ b/debian/patches/03_datafile-f-switch @@ -3,7 +3,7 @@ Description: Let --datafile also work through -f short option --- a/abook.c +++ b/abook.c -@@ -331,7 +331,7 @@ parse_command_line(int argc, char **argv +@@ -342,7 +342,7 @@ parse_command_line(int argc, char **argv { 0, 0, 0, 0 } }; diff --git a/debian/patches/727245.diff b/debian/patches/727245.diff deleted file mode 100644 index 5635971..0000000 --- a/debian/patches/727245.diff +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix corruption of address book -Author: Jorrit Tijben -Origin: upstream, http://sourceforge.net/p/abook/git/ci/3be3adcf308ee7c9c8775e2176d0592138b220ed/ -Bug: http://sourceforge.net/p/abook/mailman/message/24506494/ -Bug-727245: http://bugs.debian.org/727245 -Reviewed-by: Denis Briand ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/abook.c -+++ b/abook.c -@@ -708,6 +708,7 @@ init_add_email() - check_abook_directory(); - init_opts(); - load_opts(rcfile); -+ init_standard_fields(); - atexit(free_opts); - - /* diff --git a/debian/patches/series b/debian/patches/series index 11eeca4..293ebcf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -727245.diff -02_fix-manpage 03_datafile-f-switch -- 2.39.2