[pkg-bacula-commits] [bacula] 10/27: Removed debian/patches/fix-manpages, fixed in upstream 5.2.11
Carsten Leonhardt
cl-guest at moszumanska.debian.org
Sun Jul 19 22:38:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
cl-guest pushed a commit to branch master
in repository bacula.
commit 32c0be5bcc7956dc33273840ae7b024768b6197a
Author: Carsten Leonhardt <leo at debian.org>
Date: Mon Jul 20 00:12:23 2015 +0200
Removed debian/patches/fix-manpages, fixed in upstream 5.2.11
---
debian/patches/fix-manpages | 168 --------------------------------------------
1 file changed, 168 deletions(-)
diff --git a/debian/patches/fix-manpages b/debian/patches/fix-manpages
deleted file mode 100644
index e33a842..0000000
--- a/debian/patches/fix-manpages
+++ /dev/null
@@ -1,168 +0,0 @@
-Description: Fix simple man page errors (found by lintian)
-Bug: http://bugs.bacula.org/view.php?id=1907
-Author: Jan Hauke Rahm <jhr at debian.org>
-Reviewed-by: Alexander Golovko <alexandro at ankalagon.ru>
-Reviewed-by: Luca Capello <luca at pca.it>
-Last-Update: 2012-07-08
-
-diff --git a/manpages/bacula-tray-monitor.1 b/manpages/bacula-tray-monitor.1
-index 23f431d..a40abf5 100644
---- a/manpages/bacula-tray-monitor.1
-+++ b/manpages/bacula-tray-monitor.1
-@@ -17,7 +17,7 @@ This manual page documents briefly the
- command, a simple monitor for the 'system tray' in KDE/GNOME
- .PP
- .SH OPTIONS
--bacula-tray-monitor [\-c config_file] [\-d debug_level] [-t]
-+bacula-tray-monitor [\-c config_file] [\-d debug_level] [\-t]
- .TP
- .B \-c <config>
- Specify configuration file.
-diff --git a/manpages/bat.1 b/manpages/bat.1
-index e678eb2..f94d032 100644
---- a/manpages/bat.1
-+++ b/manpages/bat.1
-@@ -19,7 +19,7 @@ This is a GUI full featured program similar the bconsole program,
- but it is graphical oriented and more features.
- .PP
- .SH OPTIONS
--bat [\-s] [\-c config_file] [\-d debug_level] [-t]
-+bat [\-s] [\-c config_file] [\-d debug_level] [\-t]
- .TP
- .B \-c <config>
- Specify configuration file. Default is bat.conf.
-diff --git a/manpages/bsmtp.1 b/manpages/bsmtp.1
-index fee6162..67cf6f3 100644
---- a/manpages/bsmtp.1
-+++ b/manpages/bsmtp.1
-@@ -63,7 +63,7 @@ ended by sending the EOF character (Ctrl-D on many systems) on the
- start of a new line, much like many 'mail' commands.
-
- The actual, automated behavior of \fBbsmtp\fR will depend on the
--mail-related configuration of the Director in the \fIMessages\fR ressource
-+mail-related configuration of the Director in the \fIMessages\fR resource
- of \fIbacula-dir.conf\fR.
-
- Interactive use of \fBbsmtp\fR is pertinent to manually test and ensure these
-@@ -75,10 +75,10 @@ file.
-
- Messages {
- Name = Standard
-- mailcommand = "/home/bacula/bin/bsmtp -h mail.domain.com -f \"\(Bacula\) %r\"
-- -s \"Bacula: %t %e of %c %l\" %r"
-- operatorcommand = "/home/bacula/bin/bsmtp -h mail.domain.com -f \"\(Bacula\) %r\"
-- -s \"Bacula: Intervention needed for %j\" %r"
-+ mailcommand = "/home/bacula/bin/bsmtp \-h mail.domain.com \-f \\"\\(Bacula\\) \\<%r\\>\\"
-+ \-s \\"Bacula: %t %e of %c %l\\" %r"
-+ operatorcommand = "/home/bacula/bin/bsmtp \-h mail.domain.com \-f \\"\\(Bacula\\) \\<%r\\>\\"
-+ \-s \\"Bacula: Intervention needed for %j\\" %r"
- mail = sysadmin at site.domain.com = all, !skipped
- operator = sysop at site.domain.com = mount
- console = all, !skipped, !saved
-diff --git a/manpages/bwild.8 b/manpages/bwild.8
-index 51fe09f..e3bf459 100644
---- a/manpages/bwild.8
-+++ b/manpages/bwild.8
-@@ -47,7 +47,7 @@ Print timestamp in debug output
- .BI \-f\ <data\-file>
- The data-file is a filename that contains lines of data to be matched (or not) against one or more patterns. When the program is run, it will prompt you for a wild-card pattern, then apply it one line at a time against the data in the file. Each line that matches will be printed preceded by its line number. You will then be prompted again for another pattern.
- .br
--Enter an empty line for a pattern to terminate the program. You can print only lines that do not match by using the -n option, and you can suppress printing of line numbers with the -l option.
-+Enter an empty line for a pattern to terminate the program. You can print only lines that do not match by using the \-n option, and you can suppress printing of line numbers with the \-l option.
- .TP
- .BI \-n
- Print lines that do not match
-diff --git a/manpages/dbcheck.8 b/manpages/dbcheck.8
-index 9e3a6f1..fd2d148 100644
---- a/manpages/dbcheck.8
-+++ b/manpages/dbcheck.8
-@@ -8,7 +8,7 @@
- .SH NAME
- dbcheck \- Bacula's Catalog Database Check/Clean program
- .SH SYNOPSIS
--.B bcopy
-+.B dbcheck
- .RI [ options ]
- .I working-directory
- .I bacula-database
-@@ -33,32 +33,43 @@ routine. To repair a database, see the tools furnished by the
- database vendor. Normally dbcheck should never need to be run,
- but if Bacula has crashed or you have a lot of Clients, Pools, or
- Jobs that you have removed, it could be useful.
--
--It is called:
--
--Usage: dbcheck [-c config] [-C catalog name] [-d debug_level] []
-- -b batch mode
-- -C catalog name in the director conf file
-- -c director conf filename
-- -B print catalog configuration and exit
-- -dnn set debug level to nn
-- -dt print timestamp in debug output
-- -f fix inconsistencies
-- -v verbose
-- -? print this message
--
--If the -c option is given with the Director's conf file, there is no
--need to enter any of the command line arguments, in particular the working
--directory as dbcheck will read them from the file.
--
--If the -f option is specified, dbcheck will repair (fix) the
--inconsistencies it finds. Otherwise, it will report only.
--
--If the -b option is specified, dbcheck will run in batch mode, and it will
--proceed to examine and fix (if -f is set) all programmed inconsistency
--checks. If the -b option is not specified, dbcheck will enter interactive
--mode and prompt with the following:
--
-+.SH OPTIONS
-+A summary of options is included below.
-+.TP
-+.B \-?
-+Show version and usage of program.
-+.TP
-+.BI \-b
-+If specified, dbcheck will run in batch mode, and it will proceed to examine
-+and fix (if \-f is set) all programmed inconsistency checks. By default,
-+dbcheck will enter interactive mode (see below).
-+.TP
-+.BI \-C\ catalog
-+catalog name in the director conf file.
-+.TP
-+.BI \-c\ config
-+If the \-c option is given with the Director's conf file, there is no need to
-+enter any of the command line arguments, in particular the working directory
-+as dbcheck will read them from the file.
-+.TP
-+.BI \-B
-+print catalog configuration and exit.
-+.TP
-+.BI -d\ nn
-+set debug level to \fInn\fP.
-+.TP
-+.BI \-dt
-+print timestamp in debug output.
-+.TP
-+.BI \-f
-+If specified, dbcheck will repair (fix) the inconsistencies it finds.
-+Otherwise, it will report only.
-+.TP
-+.BI \-v
-+Set verbose mode.
-+.SH INTERACTIVE MODE
-+In interactive mode dbcheck will prompt with the following:
-+.PP
- Hello, this is the database check/correct program.
- Please select the function you want to perform.
- 1) Toggle modify database flag
-@@ -80,8 +91,8 @@ Please select the function you want to perform.
- 17) Quit
- Select function number:
-
--By entering 1 or 2, you can toggle the modify database flag (-f option) and
--the verbose flag (-v). It can be helpful and reassuring to turn off the
-+By entering 1 or 2, you can toggle the modify database flag (\-f option) and
-+the verbose flag (\-v). It can be helpful and reassuring to turn off the
- modify database flag, then select one or more of the consistency checks
- (items 3 through 9) to see what will be done, then toggle the modify flag
- on and re-run the check.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list