From 796a0eff1acebe858632c344e77bfc3189b2244f Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 16 Jan 2014 17:00:56 +0100
Subject: rename "distribution" in sources.list to "suite"

---
 apt-pkg/sourcelist.cc                    |  2 +-
 doc/sources.list.5.xml                   | 38 +++++++++++++++++---------------
 test/integration/test-apt-sources-deb822 |  4 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index fe0eace07..ddebd206d 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -85,7 +85,7 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
       return false;
    }
    
-   string Dist = Tags.FindS("Dist");
+   string Dist = Tags.FindS("Suite");
    Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
    
    // Define external/internal options
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index ef5219ec2..7a82bd4ce 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -79,19 +79,19 @@
    <para>The format for a <filename>sources.list</filename> entry using the
    <literal>deb</literal> and <literal>deb-src</literal> types is:</para>
 
-   <literallayout>deb [ options ] uri distribution [component1] [component2] [...]</literallayout>
+   <literallayout>deb [ options ] uri suite [component1] [component2] [...]</literallayout>
 
    <para>Alternatively a rfc822 style format is also supported:
    <literallayout>
      Type: deb
      URI: http://example.com
-     Dist: stable
+     Suite: stable
      Section: component1 component2
      [option1]: [option1-value]
 
      Type: deb-src
      URI: http://example.com
-     Dist: stable
+     Suite: stable
      Section: component1 component2
      [option1]: [option1-value]
    </literallayout>
@@ -99,14 +99,14 @@
 
    <para>The URI for the <literal>deb</literal> type must specify the base of the
    Debian distribution, from which APT will find the information it needs. 
-   <literal>distribution</literal> can specify an exact path, in which case the 
-   components must be omitted and <literal>distribution</literal> must end with
+   <literal>suite</literal> can specify an exact path, in which case the 
+   components must be omitted and <literal>suite</literal> must end with
    a slash (<literal>/</literal>). This is useful for the case when only a
    particular sub-section of the archive denoted by the URI is of interest.
-   If <literal>distribution</literal> does not specify an exact path, at least
+   If <literal>suite</literal> does not specify an exact path, at least
    one <literal>component</literal> must be present.</para>
 
-   <para><literal>distribution</literal> may also contain a variable, 
+   <para><literal>suite</literal> may also contain a variable, 
    <literal>$(ARCH)</literal>
    which expands to the Debian architecture (such as <literal>amd64</literal> or
    <literal>armel</literal>) used on the system. This permits architecture-independent
@@ -114,17 +114,19 @@
    of interest when specifying an exact path, <literal>APT</literal> will
    automatically generate a URI with the current architecture otherwise.</para>
 
-   <para>Since only one distribution can be specified per line it may be necessary
-   to have multiple lines for the same URI, if a subset of all available
-   distributions or components at that location is desired.
-   APT will sort the URI list after it has generated a complete set 
-   internally, and will collapse multiple references to the same Internet 
-   host, for instance, into a single connection, so that it does not 
-   inefficiently establish an FTP connection, close it, do something else, 
-   and then re-establish a connection to that same host. This feature is 
-   useful for accessing busy FTP sites with limits on the number of 
-   simultaneous anonymous users. APT also parallelizes connections to 
-   different hosts to more effectively deal with sites with low bandwidth.</para>
+   <para>In the traditional style sources.list format since only one
+   distribution can be specified per line it may be necessary to have
+   multiple lines for the same URI, if a subset of all available
+   distributions or components at that location is desired.  APT will
+   sort the URI list after it has generated a complete set internally,
+   and will collapse multiple references to the same Internet host,
+   for instance, into a single connection, so that it does not
+   inefficiently establish an FTP connection, close it, do something
+   else, and then re-establish a connection to that same host. This
+   feature is useful for accessing busy FTP sites with limits on the
+   number of simultaneous anonymous users. APT also parallelizes
+   connections to different hosts to more effectively deal with sites
+   with low bandwidth.</para>
 
    <para><literal>options</literal> is always optional and needs to be surrounded by
    square brackets. It can consist of multiple settings in the form
diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index fcb6010c3..00ca102be 100755
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -21,7 +21,7 @@ BASE="# some comment
 
 Type: deb
 URL: http://ftp.debian.org/debian
-Dist: stable
+Suite: stable
 Section: main
 Comment: Some random string
  that can be very long"
@@ -62,7 +62,7 @@ testequalwithmsg "Invalid sources.list file gives proper error" "E: Malformed li
 E: The list of sources could not be read."  aptget update --print-uris
 
 echo "Type: deb
-Dist: stable
+Suite: stable
 " > $SOURCES
 
 testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse)
-- 
cgit v1.2.3