Merge branch 'dh'

diff --git a/debian/changelog b/debian/changelog
index d7de2413435b0e8fc2a875da9c25c42fb76f4aae..7c2a4e721778f84bdbfdc6d327ef225da64b62b6 100644 (file)
--- 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 e89ce8c940c47acda50f66884f14270943caffda..da2d5c18f4c5df37edae7e60f53092f45c79e1a5 100644 (file)
--- 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 eb2c5b1cb6a3c1a1c9806af633ce44ef496f34fa..5fd609eb6950567a59706e8cae40e27e269c2670 100644 (file)
--- 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 (file)
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 c89c5aea5686724458af0f872b94c50cf20b1daf..11eeca4dfdf06d7d7f66ab5e79a356d0348c3d96 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+727245.diff
 02_fix-manpage
 03_datafile-f-switch