The following commit has been merged in the master branch:
commit c825865595c82c8412ae63c5904b31c3f05c1c23
Author: Guillem Jover <[email protected]>
Date: Thu Mar 28 20:04:03 2013 +0100
man: Unify WARNING and ERROR sections into DIAGNOSTICS
diff --git a/debian/changelog b/debian/changelog
index 92ae7fd..10c5170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
- Fold BACKWARD COMPATIBILITY section into other sections.
- Document since when DEB_*_MULTIARCH variables are supported.
- Move compiler flags subsection from ENVIRONMENT to NOTES.
+ - Unify WARNING and ERROR sections into DIAGNOSTICS.
* Use colon instead of dot for user:group in dpkg debug output.
* Remove support for obsolete DM-Upload-Allowed from Dpkg::Vendor::Debian.
* Fix update-alternatives to use the current alternative link as the first
diff --git a/man/dpkg-shlibdeps.1 b/man/dpkg-shlibdeps.1
index 44bdf54..63ad6d5 100644
--- a/man/dpkg-shlibdeps.1
+++ b/man/dpkg-shlibdeps.1
@@ -240,7 +240,8 @@ Show the usage message and exit.
.BR \-\-version
Show the version and exit.
.
-.SH WARNINGS
+.SH DIAGNOSTICS
+.SS Warnings
Since
.B dpkg\-shlibdeps
analyzes the set of symbols used by each binary of the generated package,
@@ -283,7 +284,7 @@ problem but some small performance improvements in binary
load time can be
obtained by not linking this library to this binary. This warning checks
the same information than the previous one but does it for each binary
instead of doing the check globally on all binaries analyzed.
-.SH ERRORS
+.SS Errors
.B dpkg\-shlibdeps
will fail if it can't find a public library used by a binary or if this
library has no associated dependency information (either shlibs file or
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 2286a67..0d09657 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -669,7 +669,7 @@ don't have any non-ignored uncommitted changes.
Then the VCS specific part of the source directory is copied over to a
temporary directory. Before this temporary directory is packed in a tarball,
various cleanup are done to save space.
-.SH WARNINGS AND ERRORS
+.SH DIAGNOSTICS
.SS no source format specified in debian/source/format
The file \fBdebian/source/format\fP should always exist and indicate the
desired source format. For backwards compatibility, format "1.0" is
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
