[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-117-gc816f2d

Luca Capello luca at pca.it
Thu May 31 16:14:54 UTC 2012 

The following commit has been merged in the master branch:
commit 042cf896725fed331c3aeb74ddb6981bdf411c45
Author: Luca Capello <luca at pca.it>
Date:   Thu May 31 18:09:53 2012 +0200

    debian/patches/upstream___Add-missing-bwild-bregex-man8-pages.patch

diff --git a/debian/additions/bregex.8 b/debian/additions/bregex.8
deleted file mode 100644
index 3dfcd20..0000000
--- a/debian/additions/bregex.8
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BREGEX 8 "01 May 2011" "Jan Hauke Rahm" "Network backup, recovery and verification"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.SH NAME
- bregex \- Bacula's regular expression tester
-.SH SYNOPSIS
-.B bregex
-.RI \-f
-.I <data-file>
-.br
-.SH DESCRIPTION
-.LP
-.B bregex
-is a simple program that will allow you to test regular expressions
-against a file of data. This can be useful because the regex libraries
-on most systems differ, and in addition, regex expressions can be
-complicated.
- 
-.LP
-The
-.I <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 regular expression 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. Enter an empty line for a pattern to terminate the
-program.
-
-.LP
-This program can be useful for testing regex expressions to be applied
-against a list of filenames.
-
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-.SH OPTIONS
-A summary of options is included below.
-.TP
-.B \-f
-Specify file of data to be matched.
-.TP
-.BI \-d\  nn
-Set debug level to \fInn\fP.
-.TP
-.BI \-l
-Suppress line numbers.
-.TP
-.BI \-n
-Print lines that do not match.
-.TP
-.B \-?
-Print this message.
-.SH SEE ALSO
-.BR bwild (8),
-.BR bacula (8).
-.br
-.SH AUTHOR
-This manual page was written by Jan Hauke Rahm
-.nh
-<jhr at debian.org>,
-for the Debian GNU/Linux system (but may be used by others). It is
-based on the Bacula user manual.
diff --git a/debian/additions/bwild.8 b/debian/additions/bwild.8
deleted file mode 100644
index ad786c3..0000000
--- a/debian/additions/bwild.8
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BREGEX 8 "01 May 2011" "Jan Hauke Rahm" "Network backup, recovery and verification"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.SH NAME
- bwild \- Bacula's wild-card expression tester
-.SH SYNOPSIS
-.B bwild
-.RI \-f
-.I <data-file>
-.br
-.SH DESCRIPTION
-.LP
-.B bwild
-is a simple program that will allow you to test wild-card expressions
-against a file of data. This can be useful because the regex libraries
-on most systems differ, and in addition, regex expressions can be
-complicated.
- 
-.LP
-The
-.I <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. Enter an empty line for a pattern to terminate the program.
-
-.LP
-This program can be useful for testing wild-card expressions to be
-applied against a list of filenames.
-
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-.SH OPTIONS
-A summary of options is included below.
-.TP
-.B \-f
-Specify file of data to be matched.
-.TP
-.BI \-d\  nn
-Set debug level to \fInn\fP.
-.TP
-.BI \-l
-Suppress line numbers.
-.TP
-.BI \-n
-Print lines that do not match.
-.TP
-.B \-?
-Print this message.
-.SH SEE ALSO
-.BR bregex (8),
-.BR bacula (8).
-.br
-.SH AUTHOR
-This manual page was written by Jan Hauke Rahm
-.nh
-<jhr at debian.org>,
-for the Debian GNU/Linux system (but may be used by others). It is
-based on the Bacula user manual.
- 
diff --git a/debian/bacula-director-common.manpages b/debian/bacula-director-common.manpages
index bfb194d..ba8ba7e 100644
--- a/debian/bacula-director-common.manpages
+++ b/debian/bacula-director-common.manpages
@@ -1,2 +1,2 @@
-debian/additions/bregex.8
-debian/additions/bwild.8
+manpages/bregex.8
+manpages/bwild.8
diff --git a/debian/changelog b/debian/changelog
index 4953b21..9f7497b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,13 +86,14 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
       provided.
   * debian/patches/fix-manpages, debian/patches/series:
     + Fix errors in manpages.
-  * debian/additions/bregex.8, debian/additions/bwild.8,
-    debian/bacula-director-common.manpages:
+  * debian/bacula-director-common.manpages:
     + Add manual pages for /usr/sbin/b{wild,regex}.
 
   [ Luca Capello ]
   * debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch:
     + import from Debian Git commit:fc7990a.
+  * debian/patches/upstream___Add-missing-bwild-bregex-man8-pages.patch:
+    + import from upstream Git commit:3cd099b.
   * debian/README.Debian:
     + explain why upstream sources are not DFSG-free.
 
diff --git a/debian/patches/series b/debian/patches/series
index 3956857..6bae1b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ remove-use-statement-for-mysql
 fix-example-script-syntax
 fix-manpages
 fix-mysql55-sql-syntax.patch
+upstream___Add-missing-bwild-bregex-man8-pages.patch
diff --git a/debian/patches/upstream___Add-missing-bwild-bregex-man8-pages.patch b/debian/patches/upstream___Add-missing-bwild-bregex-man8-pages.patch
new file mode 100644
index 0000000..4b7b9ab
--- /dev/null
+++ b/debian/patches/upstream___Add-missing-bwild-bregex-man8-pages.patch
@@ -0,0 +1,157 @@
+Description: Add missing bwild & bregex man8 pages
+Origin: upstream, commit:3cd099baf538d7773ca95a9ae793c9fed6abcbf7
+Author: Bruno Friedmann <bruno at ioda-net.ch>
+Last-Update: 2012-05-31
+
+---
+ bacula/manpages/Makefile.in |    2 +-
+ bacula/manpages/bregex.8    |   61 +++++++++++++++++++++++++++++++++++++++
+ bacula/manpages/bwild.8     |   66 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 128 insertions(+), 1 deletion(-)
+ create mode 100644 bacula/manpages/bregex.8
+ create mode 100644 bacula/manpages/bwild.8
+
+--- a/manpages/Makefile.in
++++ b/manpages/Makefile.in
+@@ -6,7 +6,7 @@
+ 
+ MAN8 = bacula.8 bacula-dir.8 bacula-fd.8 bacula-sd.8 \
+        bconsole.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 \
+-       btraceback.8 dbcheck.8
++       btraceback.8 dbcheck.8 bwild.8 bregex.8 
+ 
+ MAN1 = bacula-tray-monitor.1 bacula-bwxconsole.1 bsmtp.1 bat.1
+       
+--- /dev/null
++++ b/manpages/bregex.8
+@@ -0,0 +1,61 @@
++.\"                                      Hey, EMACS: -*- nroff -*-
++.\" First parameter, NAME, should be all caps
++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
++.\" other parameters are allowed: see man(7), man(1)
++.TH BREGEX 8 "30 October 2011" "Kern Sibbald" "Network backup, utilities"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh        disable hyphenation
++.\" .hy        enable hyphenation
++.\" .ad l      left justify
++.\" .ad b      justify to both left and right margins
++.\" .nf        disable filling
++.\" .fi        enable filling
++.\" .br        insert line break
++.\" .sp <n>    insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++ bregex \- Bacula's 'regex' engine
++.SH SYNOPSIS
++.B bregex
++.RI [ options ]
++.I -f <data\-file>
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B bregex
++command.
++.br
++This program can be useful for testing regex expressions to be applied against a list of filenames.
++.PP
++.\" TeX users may be more comfortable with the \fB<whatever>\fP and
++.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
++.\" respectively.
++.SH OPTIONS
++A summary of options is included below.
++.TP
++.B \-?
++Show version and usage of program.
++.TP
++.BI \-d\  nn
++Set debug level to \fInn\fP.
++.TP
++.BI \-dt
++Print timestamp in debug output
++.TP
++.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 regular expression 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. 
++.TP
++.BI \-n 
++Print lines that do not match
++.TP
++.BI \-l
++Suppress lines numbers.
++.SH SEE ALSO
++.BR regex(7)
++.br
++.SH AUTHOR
++This manual page was written by Bruno Friedmann
++.nh 
++<bruno at ioda\-net.ch>.
+--- /dev/null
++++ b/manpages/bwild.8
+@@ -0,0 +1,66 @@
++.\"                                      Hey, EMACS: -*- nroff -*-
++.\" First parameter, NAME, should be all caps
++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
++.\" other parameters are allowed: see man(7), man(1)
++.TH BWILD 8 "30 October 2011" "Kern Sibbald" "Network backup, utilities"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh        disable hyphenation
++.\" .hy        enable hyphenation
++.\" .ad l      left justify
++.\" .ad b      justify to both left and right margins
++.\" .nf        disable filling
++.\" .fi        enable filling
++.\" .br        insert line break
++.\" .sp <n>    insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++ bwild \- Bacula's 'wildcard' engine
++.SH SYNOPSIS
++.B bwild
++.RI [ options ]
++.I -f <data\-file>
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B bwild
++command.
++.br
++This is a simple program that will allow you to test wild-card expressions against a file of data.
++.PP
++.\" TeX users may be more comfortable with the \fB<whatever>\fP and
++.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
++.\" respectively.
++.SH OPTIONS
++A summary of options is included below.
++.TP
++.B \-?
++Show version and usage of program.
++.TP
++.BI \-d\  nn
++Set debug level to \fInn\fP.
++.TP
++.BI \-dt
++Print timestamp in debug output
++.TP
++.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. 
++.TP
++.BI \-n 
++Print lines that do not match
++.TP
++.BI \-l
++Suppress lines numbers.
++.TP
++.BI \-i
++use case insensitive match.
++.SH SEE ALSO
++.BR fnmatch(3)
++.br
++.SH AUTHOR
++This manual page was written by Bruno Friedmann
++.nh 
++<bruno at ioda\-net.ch>.

-- 
Bacula, a network backup, recovery and verification program

More information about the pkg-bacula-commits mailing list