rename URL to Uri in deb822-sources

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index ddebd206d5a0592d23f017a6dcd91caf0184b470..0cea8dc7fc0f1d64c39abc39666ea519d2403c27 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -78,7 +78,7 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
 {
    map<string, string> Options;
 
 {
    map<string, string> Options;
 

-   string URI = Tags.FindS("URL");
+   string URI = Tags.FindS("Uri");

    if (!FixupURI(URI))
    {
       _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
    if (!FixupURI(URI))
    {
       _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 7a82bd4ce7840a8e38501ed8a80d94554983fd1e..e770023d59d32462773c7ab6e913006f727186f9 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -84,13 +84,13 @@
    <para>Alternatively a rfc822 style format is also supported:
    <literallayout>
      Type: deb
    <para>Alternatively a rfc822 style format is also supported:
    <literallayout>
      Type: deb

-     URI: http://example.com
+     Uri: http://example.com

      Suite: stable
      Section: component1 component2
      [option1]: [option1-value]
 
      Type: deb-src
      Suite: stable
      Section: component1 component2
      [option1]: [option1-value]
 
      Type: deb-src

-     URI: http://example.com
+     Uri: http://example.com

      Suite: stable
      Section: component1 component2
      [option1]: [option1-value]
      Suite: stable
      Section: component1 component2
      [option1]: [option1-value]

diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index 00ca102be0f7fa753f8697e4b4aa438a7ad0d95f..edf52487c3c654ec4132b531548e4e40cb6552d4 100755 (executable)
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -20,7 +20,7 @@ BASE="# some comment
 #Type: meep
 
 Type: deb
 #Type: meep
 
 Type: deb

-URL: http://ftp.debian.org/debian
+Uri: http://ftp.debian.org/debian

 Suite: stable
 Section: main
 Comment: Some random string
 Suite: stable
 Section: main
 Comment: Some random string