Recommend ${binary:Version} instead of ${Source-Version}

${Source-Version} was confusing (since it actually is replaced with the
binary package version in, for example, binNMUs) and has been deprecated
in dpkg.  ${binary:Version} should be used instead.  Update Policy's
recommendation accordingly.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-5

diff --git a/debian/changelog b/debian/changelog
index 020d3590e19d1bbd303236b2d812e872d2f3fd7d..ade3d35bf7ab4721a26b4d36eb5a250ee7c2646c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,9 @@ debian-policy (3.7.3.0) UNRELEASED; urgency=low
     Allombert                                                (Closes: #361418).
   * Bug fix: "typo: "must not be not world-writable"", thanks to Sam
     Hocevar                                                  (Closes: #392594).
-  
+  * Bug fix: "debian-policy: recommend binary:Version substvar instead",
+    thanks to Guillem Jover                                  (Closes: #418444).
+
  --
 
 debian-policy (3.7.2.2) unstable; urgency=low

diff --git a/policy.sgml b/policy.sgml
index 9e23bc040af2a6195a9d701ac3dbbdb7f6632b0c..4f2d47c1b744ddcdf139e4efe36efc71d031930a 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -4719,8 +4719,12 @@ Replaces: mail-transport-agent
          Typically the development version should have an exact
          version dependency on the runtime library, to make sure that
          compilation and linking happens correctly.  The
-         <tt>${Source-Version}</tt> substitution variable can be
+         <tt>${binary:Version}</tt> substitution variable can be
          useful for this purpose.
+          <footnote>
+            Previously, <tt>${Source-Version}</tt> was used, but its name
+            was confusing and it has been deprecated since dpkg 1.13.19.
+          </footnote>
        </p>
       </sect>
 

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index 9d2582428b770687da807cb1a4e49e1166022389..f3bf0af135ee466b01dcef9983b78a2dabdf903d 100644 (file)
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -59,6 +59,9 @@ picking your way through this list.
      * Scripts may assume that /bin/sh supports local (at a basic level)
        and that its test builtin (if any) supports -a and -o binary
        logical operators.                                        [10.4]
+     * The substitution variable ${binary:Version} should be used in place
+       of ${Source-Version} for dependencies between packages of the same
+       library.                                                  [8.5]
      * Substantial reorganization and renaming of sections in the Debian
        menu structure.  Packages with menu entries should be reviewed to
        see if the menu section has been renamed or if one of the new