From 18166d994c40f6ace8002511b1a0f199814027b1 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Mon, 2 Jun 2008 13:58:48 -0700
Subject: [PATCH] Policy: minor typos in dpkg-shlibdeps and dpkg-architecture

Fix minor typos in appendix C in the sections on dpkg-shlibdeps and
dpkg-architecture.  Also remove the note that future versions of
dpkg-shlibdeps will be called on shared libraries as well and just
say that it acts on both executables and shared libraries.

Thanks to Sandro Tosi <matrixhasu@gmail.com> for the corrections.
Closes: #481954
---
 debian/changelog |  3 +++
 policy.sgml      | 13 ++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26a714d..84e2355 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,9 @@ debian-policy (3.8.0.0) unstable; urgency=low
   * Policy: bugs fixed in NMUs are now closed rather than marked fixed
     Wording: Russ Allbery <rra@debian.org> (thanks, Sandro Tosi)
     Closes: #481640
+  * Policy: C.1.4, C.1.8: minor typos
+    Wording: Sandro Tosi <matrixhasu@gmail.com>
+    Closes: #481954
   * Remove the now-obsolete policy-process document.
   * Add an md5sums control file.
   * Add Vcs-Browser and Vcs-Git control fields.
diff --git a/policy.sgml b/policy.sgml
index 48db55a..7c8cfe1 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -9620,13 +9620,8 @@ install-info --quiet --remove /usr/share/info/foobar.info
 	  </p>
 
 	  <p>
-	    Its arguments are executables.
+	    Its arguments are executables and shared libraries
 	    <footnote>
-	      <p>
-		In a forthcoming dpkg version,
-		<prgn>dpkg-shlibdeps</prgn> would be required to be
-		called on shared libraries as well.
-	      </p>
 	      <p>
 		They may be specified either in the locations in the
 		source tree where they are created or in the locations
@@ -9674,7 +9669,7 @@ install-info --quiet --remove /usr/share/info/foobar.info
 	    and then in its main control file <file>debian/control</file>:
 	    <example>
   <var>...</var>
-  Depends: ${shlibs:Pre-Depends}
+  Depends: ${shlibs:Depends}
   Recommends: ${shlibs:Recommends}
   <var>...</var>
 	    </example>
@@ -9783,8 +9778,8 @@ install-info --quiet --remove /usr/share/info/foobar.info
           <p>
             This program can be used manually, but is also invoked by
             <tt>dpkg-buildpackage</tt> or <file>debian/rules</file> to set
-            to set environment or make variables which specify the build and
-            host architecture for the package building process.
+            environment or make variables which specify the build and host
+            architecture for the package building process.
           </p>
         </sect1>
       </sect>
-- 
2.39.5