diff --git a/bacula-7.0.0-help-update.patch b/bacula-7.0.0-help-update.patch deleted file mode 100644 index 3314946..0000000 --- a/bacula-7.0.0-help-update.patch +++ /dev/null @@ -1,130 +0,0 @@ -commit c2fb0f13bbc8c6a71026ff7b491ac58fd0d8d240 -Author: Simone Caronni -Date: Sun Mar 30 16:07:16 2014 +0200 - - Align command line switches in manpages. - -diff --git a/bacula/manpages/bacula-dir.8 b/bacula/manpages/bacula-dir.8 -index c5cd965..e3664b6 100644 ---- a/bacula/manpages/bacula-dir.8 -+++ b/bacula/manpages/bacula-dir.8 -@@ -37,6 +37,9 @@ Run in foreground (for debugging). - .BI \-g\ group - Set the group/gid to run as. - .TP -+.BI \-m -+Print kaboom output (for debugging). -+.TP - .BI \-r\ job - Run . - .TP -diff --git a/bacula/manpages/bacula-fd.8 b/bacula/manpages/bacula-fd.8 -index 9e9fca0..6a4d7fb 100644 ---- a/bacula/manpages/bacula-fd.8 -+++ b/bacula/manpages/bacula-fd.8 -@@ -39,12 +39,12 @@ Run in foreground (for debugging). - .BI \-g\ group - Set the group/gid to run as. - .TP --.BI \-p --Proceed inspite of I/O errors --.TP - .BI \-k - Keep readall permission when dropping privileges. - .TP -+.BI \-m -+Print kaboom output (for debugging). -+.TP - .BI \-s - No signals (for debugging). - .TP -diff --git a/bacula/manpages/bacula-sd.8 b/bacula/manpages/bacula-sd.8 -index 6dd36dc..aed27a3 100644 ---- a/bacula/manpages/bacula-sd.8 -+++ b/bacula/manpages/bacula-sd.8 -@@ -40,6 +40,9 @@ Set the group/gid to run as. - .BI \-p - Proceed in spite of I/O errors - .TP -+.BI \-m -+Print kaboom output (for debugging) -+.TP - .BI \-s - No signals (for debugging). - .TP -diff --git a/bacula/manpages/bacula-tray-monitor.1 b/bacula/manpages/bacula-tray-monitor.1 -index 811a4e4..39a2869 100644 ---- a/bacula/manpages/bacula-tray-monitor.1 -+++ b/bacula/manpages/bacula-tray-monitor.1 -@@ -25,6 +25,9 @@ Specify configuration file. - .B \-d - Set debug level to \fInn\fP. - .TP -+.B \-dt -+Print timestamp in debug output. -+.TP - .B \-t - Test config mode: read configuration and exit. - .TP -@@ -32,7 +35,6 @@ Test config mode: read configuration and exit. - Show version and usage of program. - .SH SEE ALSO - .BR bacula-dir (8), --.BR bacula-wxconsole (1) - .BR bls (1), - .BR bextract (1). - .br -diff --git a/bacula/manpages/bconsole.8 b/bacula/manpages/bconsole.8 -index 13d892c..b536783 100644 ---- a/bacula/manpages/bconsole.8 -+++ b/bacula/manpages/bconsole.8 -@@ -18,6 +18,12 @@ command. - .PP - .SH OPTIONS - .TP -+.BI \-D\ dir -+Select a Director. -+.TP -+.BI \-l -+List defined Directors. -+.TP - .BI \-c\ config - Specify configuration file. - .TP -@@ -33,6 +39,9 @@ No conio (for scripting). - .B \-s - No signals (for debugging). - .TP -+.b \-u\ nn -+Set command execution timeout to \fInn\fP seconds. -+.TP - .B \-t - Test the configuration file and report errors. - .TP -diff --git a/bacula/manpages/btape.8 b/bacula/manpages/btape.8 -index e19a36f..2188ce2 100644 ---- a/bacula/manpages/btape.8 -+++ b/bacula/manpages/btape.8 -@@ -38,9 +38,6 @@ Set debug level to \fInn\fP. - .BI \-p - Proceed inspite of I/O errors. - .TP --.B \-t --Open the default tape device. --.TP - .B \-s - No signals (for debugging). - .TP -diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c -index 80176a7..b1f1476 100644 ---- a/bacula/src/console/console.c -+++ b/bacula/src/console/console.c -@@ -1011,7 +1011,7 @@ int main(int argc, char *argv[]) - working_directory = "/tmp"; - args = get_pool_memory(PM_FNAME); - -- while ((ch = getopt(argc, argv, "D:lbc:d:nstu:?")) != -1) { -+ while ((ch = getopt(argc, argv, "D:lc:d:nstu:?")) != -1) { - switch (ch) { - case 'D': /* Director */ - if (director) {