X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=debian%2Fpatches%2F02_fix-manpage;h=da2d5c18f4c5df37edae7e60f53092f45c79e1a5;hb=6133e3671ffd285d67c11f8ffa3b7ff07f958bc4;hp=45b434576b73104c295f03723ff7fec2cc3308c6;hpb=03f9ed0d7defd9030b896b4761849432650d1959;p=pkg%2Fabook.git

diff --git a/debian/patches/02_fix-manpage b/debian/patches/02_fix-manpage
index 45b4345..da2d5c1 100644
--- a/debian/patches/02_fix-manpage
+++ b/debian/patches/02_fix-manpage
@@ -1,13 +1,11 @@
-Author: Gerfried Fuchs <rhonda@debian.at>	vim:ft=diff:
+Author: Gerfried Fuchs <rhonda@debian.org>	vim:ft=diff:
 Description: Escape hyphens in manpage where they mean the minus sign
 
-Index: abook-0.5.6/abook.1
-===================================================================
---- abook-0.5.6.orig/abook.1
-+++ abook-0.5.6/abook.1
-@@ -80,11 +80,11 @@ The following \fIoutputformats\fR are su
+--- a/abook.1
++++ b/abook.1
+@@ -82,11 +82,11 @@ The following \fIoutputformats\fR are su
  .br
- - \fBwl\fP Wanderlust address book
+ - \fBbsdcal\fP BSD calendar
  .TP
 -\fB\-\-add-email\fP
 +\fB\-\-add\-email\fP
@@ -20,34 +18,14 @@ Index: abook-0.5.6/abook.1
  .TP
  \fB\-\-formats\fP
  List available formats.
-Index: abook-0.5.6/abookrc.5
-===================================================================
---- abook-0.5.6.orig/abookrc.5
-+++ abook-0.5.6/abookrc.5
-@@ -47,7 +47,7 @@ Defines the field to display in the extr
- .br
- \fIfield\fP can be any of the following:
- .br
---1			disabled
-+\-1			disabled
- .br
- phone		Home Phone
- .br
-@@ -125,7 +125,7 @@ set emailpos=25
- # Field to be used in the extra column
- set extra_column=phone
- # frequently used values:
--#	-1          disabled
-+#	\-1          disabled
- #	phone       Home Phone
- #	workphone   Work Phone
- #	fax         Fax
-@@ -134,7 +134,7 @@ set extra_column=phone
- #	url         URL
- 
- #
--set extra_alternative=-1
-+set extra_alternative=\-1
- 
- # Screen column for the extra field to start
- set extrapos=65
+--- 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