[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-131-g266d544
Alexander Golovko
alexandro at ankalagon.ru
Fri Jun 1 15:07:32 UTC 2012
The following commit has been merged in the master branch:
commit c6de23f17a9c1f29bdec7424db7649aaf5ff6195
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Fri Jun 1 18:13:49 2012 +0400
fix manpage errors
diff --git a/debian/patches/fix-manpages b/debian/patches/fix-manpages
index 09758ee..303b0d6 100644
--- a/debian/patches/fix-manpages
+++ b/debian/patches/fix-manpages
@@ -2,11 +2,13 @@ Description: Fix simple man page errors (found by lintian)
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-05-31
+Last-Update: 2012-06-01
+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 @@
+@@ -17,7 +17,7 @@ This manual page documents briefly the
command, a simple monitor for the 'system tray' in KDE/GNOME
.PP
.SH OPTIONS
@@ -15,9 +17,11 @@ Last-Update: 2012-05-31
.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 @@
+@@ -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
@@ -26,9 +30,11 @@ Last-Update: 2012-05-31
.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 @@
+@@ -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
@@ -37,7 +43,7 @@ Last-Update: 2012-05-31
of \fIbacula-dir.conf\fR.
Interactive use of \fBbsmtp\fR is pertinent to manually test and ensure these
-@@ -75,10 +75,10 @@
+@@ -75,10 +75,10 @@ file.
Messages {
Name = Standard
@@ -45,26 +51,46 @@ Last-Update: 2012-05-31
- -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"
++ 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
-@@ -115,4 +115,4 @@
- .nh
- <lbc at members.fsf.org>.
- .SH SEE ALSO
--.BR "bacula-dir" "(8) "
-\ No newline at end of file
-+.BR "bacula-dir" "(8) "
+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
-@@ -36,27 +36,27 @@
-
- It is called:
-
+@@ -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
@@ -75,36 +101,60 @@ Last-Update: 2012-05-31
- -f fix inconsistencies
- -v verbose
- -? print this message
-+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
-+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.
-
+-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
-+If the \-f option is specified, dbcheck will repair (fix) the
- inconsistencies it finds. Otherwise, it will report only.
-
+-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
-+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:
-
+-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.
-@@ -80,8 +80,8 @@
+ 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:
diff --git a/debian/patches/series b/debian/patches/series
index 6bae1b8..9f438af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,6 @@ fix-mysql-autoconf.patch
fix-readline-ncurses-depends.patch
remove-use-statement-for-mysql
fix-example-script-syntax
-fix-manpages
fix-mysql55-sql-syntax.patch
upstream___Add-missing-bwild-bregex-man8-pages.patch
+fix-manpages
--
Bacula, a network backup, recovery and verification program
More information about the pkg-bacula-commits
mailing list