From: Rhonda D'Vine <rhonda@debian.org>
Date: Thu, 13 Aug 2015 14:58:30 +0000 (+0200)
Subject: Merge branch 'dh'
X-Git-Tag: debian/0.6.0_pre2-5
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=5476775a4aacb530a376f0ee790ca0fbd6e8ad3f;hp=f2053e6dae680b82aa8afef3861f1555289add13;p=pkg%2Fabook.git

Merge branch 'dh'
---

diff --git a/debian/changelog b/debian/changelog
index d7de241..7c2a4e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,15 +7,15 @@ abook (0.6.0~pre2-5) unstable; urgency=low
 
  -- Denis Briand <debian@denis-briand.fr>  Thu, 13 Aug 2015 16:48:16 +0200
 
-abook (0.6.0~pre2-4) unstable; urgency=high
+abook (0.6.0~pre2-4) unstable; urgency=medium
 
   [ Rhonda D'Vine ]
   * Add -std=gnu89 to CFLAGS as suggested by Martin Michlmayr to fix FTBFS
     with gcc-5, thanks (closes: #777764)
 
   [ Denis Briand ]
-  * Add me as co-maintainer (Thanks Rhonda). 
-  * Bump standards version to 3.9.6 
+  * Add me as co-maintainer (Thanks Rhonda).
+  * Bump standards version to 3.9.6
   * Use dpkg-buildflags.
   * Rename Debian version (same of upstream tarball)
   * Switch to dpkg-source 3.0 (quilt) format
diff --git a/debian/patches/02_fix-manpage b/debian/patches/02_fix-manpage
index e89ce8c..da2d5c1 100644
--- a/debian/patches/02_fix-manpage
+++ b/debian/patches/02_fix-manpage
@@ -1,8 +1,6 @@
 Author: Gerfried Fuchs <rhonda@debian.org>	vim:ft=diff:
 Description: Escape hyphens in manpage where they mean the minus sign
 
-Index: b/abook.1
-===================================================================
 --- a/abook.1
 +++ b/abook.1
 @@ -82,11 +82,11 @@ The following \fIoutputformats\fR are su
@@ -20,8 +18,6 @@ Index: b/abook.1
  .TP
  \fB\-\-formats\fP
  List available formats.
-Index: b/abookrc.5
-===================================================================
 --- a/abookrc.5
 +++ b/abookrc.5
 @@ -90,7 +90,7 @@ Defines the way entries are displayed in
diff --git a/debian/patches/03_datafile-f-switch b/debian/patches/03_datafile-f-switch
index eb2c5b1..5fd609e 100644
--- a/debian/patches/03_datafile-f-switch
+++ b/debian/patches/03_datafile-f-switch
@@ -1,8 +1,6 @@
 Author: Gerfried Fuchs <rhonda@debian.org>	vim:ft=diff:
 Description: Let --datafile also work through -f short option
 
-Index: b/abook.c
-===================================================================
 --- a/abook.c
 +++ b/abook.c
 @@ -331,7 +331,7 @@ parse_command_line(int argc, char **argv
diff --git a/debian/patches/727245.diff b/debian/patches/727245.diff
new file mode 100644
index 0000000..5635971
--- /dev/null
+++ b/debian/patches/727245.diff
@@ -0,0 +1,18 @@
+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 <debian@denis-briand.fr>
+---
+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 c89c5ae..11eeca4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+727245.diff
 02_fix-manpage
 03_datafile-f-switch