Merge remote-tracking branch 'mvo/feature/source-deb822' into debian/experimental...

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 09d8287a0eb8e258b6767f30845187927ee65fa8..51b766095edee84fd307e232e8b0cf00df53da9b 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;
 
-   string URI = Tags.FindS("Uri");
+   string URI = Tags.FindS("URI");
    if (!FixupURI(URI))
    {
       _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
@@ -87,7 +87,7 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
    
    // Define external/internal options
    const char* option_deb822[] = { 
-      "Architectures", "Architectures-Add", "Architectures-Delete", "Trusted",
+      "Architectures", "Architectures-Add", "Architectures-Remove", "Trusted",
    };
    const char* option_internal[] = { 
       "arch", "arch+", "arch-", "trusted",

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index e770023d59d32462773c7ab6e913006f727186f9..7a82bd4ce7840a8e38501ed8a80d94554983fd1e 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
-     Uri: http://example.com
+     URI: http://example.com
      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]

diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index 758ae5ae3b93eb3dc8aedffc025869dd1d1d20db..a3855496c5b1b30608ac75e354bdda6024b0a8b2 100755 (executable)
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -13,7 +13,7 @@ BASE='# some comment
 #Type: meep
 
 Type: deb
-Uri: http://ftp.debian.org/debian
+URI: http://ftp.debian.org/debian
 Suite: stable
 Section: main
 Comment: Some random string

diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
index bf61746c437a264376cc26b474df6372bc684c99..b8658ccf1b55aec321b465c0958e404944c3e467 100644 (file)
--- a/test/libapt/sourcelist_test.cc
+++ b/test/libapt/sourcelist_test.cc
@@ -23,14 +23,14 @@ int main(int argc, char *argv[])
 {
    const char contents[] = ""
       "Type: deb\n"
-      "Uri: http://ftp.debian.org/debian\n"
+      "URI: http://ftp.debian.org/debian\n"
       "Suite: stable\n"
       "Section: main\n"
       "Comment: Some random string\n"
       " that can be very long\n"
       "\n"
       "Type: deb\n"
-      "Uri: http://ftp.debian.org/debian\n"
+      "URI: http://ftp.debian.org/debian\n"
       "Suite: unstable\n"
       "Section: main non-free\n"
       ;