Hi, The attached file is an updated diff for my docbook-utils 0.6.14-1.1 NMU which takes precedence over any other diff with this version sent by me. The associated changelog entry is:
docbook-utils (0.6.14-1.1) unstable; urgency=medium
* Non-maintainer upload.
* Fix bashism in 'jw' script (Closes: #472894)
* Apply patch to escape "." and "'" properly which was causing breakage
in some manpages. Patch by Nicolas François. (Closes: #399947)
* Bump Standards-Version to 3.7.3
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -Nru docbook-utils-0.6.14/bin/jw.in docbook-utils-0.6.14/bin/jw.in
--- docbook-utils-0.6.14/bin/jw.in 2008-06-02 03:45:57.000000000 +0100
+++ docbook-utils-0.6.14/bin/jw.in 2008-06-02 03:45:57.000000000 +0100
@@ -186,8 +186,8 @@
shift 2
;;
-w|--warning) case $2 in
- list) echo -e "List of allowed warning types (multiple -w
options are allowed):\n"
- echo -e $SGML_WARNINGS_LIST
+ list) printf "List of allowed warning types (multiple -w
options are allowed):\n\n"
+ printf "$SGML_WARNINGS_LIST\n"
exit 0
;;
xml|mixed|sgmldecl|should|default|duplicate|undefined|unclosed|empty|net|min-tag|unused-map|unused-param|notation-sysid|all|no-xml|no-mixed|no-sgmldecl|no-should|no-default|no-duplicate|no-undefined|no-unclosed|no-empty|no-net|no-min-tag|no-unused-map|no-unused-param|no-notation-sysid)
\
@@ -195,14 +195,14 @@
shift 2
;;
*) echo "Unknown warning type \"$2\". Allowed warning
types are:" >&2
- echo -e $SGML_WARNINGS_LIST >&2
+ printf "$SGML_WARNINGS_LIST\n" >&2
exit 1
;;
esac
;;
-e|--error) case $2 in
- list) echo -e "List of allowed error types (multiple -e
options are allowed):\n"
- echo -e $SGML_ERRORS_LIST
+ list) printf "List of allowed error types (multiple -e
options are allowed):\n\n"
+ printf "$SGML_ERRORS_LIST\n"
exit 0
;;
no-idref|no-significant|no-valid) \
@@ -210,19 +210,19 @@
shift 2
;;
*) echo "Unknown error type \"$2\". Allowed error types
are:" >&2
- echo -e $SGML_ERRORS_LIST >&2
+ printf "$SGML_ERRORS_LIST\n" >&2
exit 1
;;
esac
;;
- -h|--help) echo -e "`basename $0` - Jade Wrapper\n"
- echo -e "$SGML_HELP_MESSAGE"
+ -h|--help) printf "`basename $0` - Jade Wrapper\n\n"
+ printf "$SGML_HELP_MESSAGE\n"
exit 0
;;
- -v|--version) echo -e "$SGML_VERSION_MESSAGE"
+ -v|--version) printf "$SGML_VERSION_MESSAGE\n"
exit 0
;;
- -*) echo -e "$SGML_HELP_MESSAGE" >&2
+ -*) printf "$SGML_HELP_MESSAGE\n" >&2
exit 1
;;
*) if [ -z "$SGML_FILE" ]
@@ -233,7 +233,7 @@
esac
shift 1
else
- echo -e "$SGML_HELP_MESSAGE" >&2
+ printf "$SGML_HELP_MESSAGE\n" >&2
exit 1
fi
;;
@@ -243,7 +243,7 @@
# Check that we have a frontend
if [ -z "$SGML_FRONTEND" ]
then
- echo -e $SGML_HELP_MESSAGE >&2
+ printf "$SGML_HELP_MESSAGE\n" >&2
exit 1
fi
if [ ! -s $SGML_FRONTEND ]
@@ -255,7 +255,7 @@
# Check that we have a backend
if [ -z "$SGML_BACKEND" ]
then
- echo -e $SGML_HELP_MESSAGE >&2
+ printf "$SGML_HELP_MESSAGE\n" >&2
exit 1
fi
if [ ! -s $SGML_BACKEND ]
@@ -267,7 +267,7 @@
# Check that we have a file to process
if [ -z "$SGML_FILE" ]
then
- echo -e $SGML_HELP_MESSAGE >&2
+ printf "$SGML_HELP_MESSAGE\n" >&2
exit 1
fi
if [ ! -s $SGML_FILE ]
@@ -402,7 +402,7 @@
# Create output directory if not available
if [ -z "$SGML_OUTPUT_DIRECTORY" ]
then
- echo -e $SGML_HELP_MESSAGE >&2
+ printf "$SGML_HELP_MESSAGE\n" >&2
exit 1
fi
if [ ! -d $SGML_OUTPUT_DIRECTORY ]
diff -Nru docbook-utils-0.6.14/debian/changelog
docbook-utils-0.6.14/debian/changelog
--- docbook-utils-0.6.14/debian/changelog 2008-06-02 03:45:57.000000000
+0100
+++ docbook-utils-0.6.14/debian/changelog 2008-06-02 03:45:57.000000000
+0100
@@ -1,3 +1,13 @@
+docbook-utils (0.6.14-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix bashism in 'jw' script (Closes: #472894)
+ * Apply patch to escape "." and "'" properly which was causing breakage
+ in some manpages. Patch by Nicolas François. (Closes: #399947)
+ * Bump Standards-Version to 3.7.3
+
+ -- Chris Lamb <[EMAIL PROTECTED]> Mon, 02 Jun 2008 03:40:32 +0100
+
docbook-utils (0.6.14-1) unstable; urgency=low
* New upstream release
diff -Nru docbook-utils-0.6.14/debian/control
docbook-utils-0.6.14/debian/control
--- docbook-utils-0.6.14/debian/control 2008-06-02 03:45:57.000000000 +0100
+++ docbook-utils-0.6.14/debian/control 2008-06-02 03:45:57.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian XML/SGML Group <[EMAIL PROTECTED]>
Uploaders: Ardo van Rangelrooij <[EMAIL PROTECTED]>
-Standards-Version: 3.6.1
+Standards-Version: 3.7.3
Build-Depends-Indep: debhelper (>= 4.1), docbook-dsssl, jade, perl, sgmlspl, sp
Package: docbook-utils
diff -Nru docbook-utils-0.6.14/helpers/docbook2man-spec.pl
docbook-utils-0.6.14/helpers/docbook2man-spec.pl
--- docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2003-06-10
09:30:30.000000000 +0100
+++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2008-06-02
03:45:57.000000000 +0100
@@ -1199,8 +1199,8 @@
$_[0] =~ s/\\/\\\\/g;
# Escape dots and single quotes in column 1
- $_[0] =~ s/^\./\\\&\./;
- $_[0] =~ s/^\'/\\\&\'/;
+ $_[0] =~ s/^[ \t]*\./\\\&\./;
+ $_[0] =~ s/^[ \t]*\'/\\\&\'/;
# In non-'pre'-type elements:
if(!$nocollapse_whitespace) {
signature.asc
Description: PGP signature
