merged from the debian-sid tree

2 files changed, 541 insertions, 20 deletions

diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in
index b9f70940..3ffe174d 100644
--- a/data/templates/Debian.info.in
+++ b/data/templates/Debian.info.in
@@ -1,5 +1,35 @@
 _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
+Suite: wheezy
+RepositoryType: deb
+BaseURI: http://http.us.debian.org/debian/
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
+_Description: Debian 7.0 'Wheezy' 
+Component: main
+_CompDescription: Officially supported
+Component: contrib
+_CompDescription: DFSG-compatible Software with Non-Free Dependencies
+Component: non-free
+_CompDescription: Non-DFSG-compatible Software
+
+Suite: wheezy/updates
+RepositoryType: deb
+BaseURI: http://security.debian.org/
+MatchURI: security\.debian\.org
+ParentSuite: wheezy
+_Description: Security updates
+
+Suite: wheezy-updates
+RepositoryType: deb
+ParentSuite: wheezy
+_Description: Recommended updates
+
+Suite: wheezy-proposed-updates
+RepositoryType: deb
+ParentSuite: wheezy
+_Description: Proposed updates
+
 Suite: squeeze
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index a9b539af..2aba269e 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -1,5 +1,478 @@
 _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
+Suite: quantal
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 12.04 'Precise Pangolin'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: quantal
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 12.04 'Precise Pangolin'
+
+Suite: quantal
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*12.04
+MatchURI: cdrom:\[Ubuntu.*12.04
+_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: quantal
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: quantal
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: quantal-security
+ParentSuite: quantal
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: quantal-security
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: quantal-updates
+ParentSuite: quantal
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: quantal-updates
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: quantal-proposed
+ParentSuite: quantal
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: quantal-proposed
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: quantal-backports
+ParentSuite: quantal
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: quantal-backports
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
+Suite: precise
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 12.04 'Precise Pangolin'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: precise
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 12.04 'Precise Pangolin'
+
+Suite: precise
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*12.04
+MatchURI: cdrom:\[Ubuntu.*12.04
+_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: precise
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: precise
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: precise-security
+ParentSuite: precise
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: precise-security
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: precise-updates
+ParentSuite: precise
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: precise-updates
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: precise-proposed
+ParentSuite: precise
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: precise-proposed
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: precise-backports
+ParentSuite: precise
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: precise-backports
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
+Suite: oneiric
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 11.10 'Oneiric Ocelot'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: oneiric
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 11.10 'Oneiric Ocelot'
+
+Suite: oneiric
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*11.10
+MatchURI: cdrom:\[Ubuntu.*11.10
+_Description: Cdrom with Ubuntu 11.10 'Oneiric Ocelot'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: oneiric
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: oneiric
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: oneiric-security
+ParentSuite: oneiric
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: oneiric-security
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: oneiric-updates
+ParentSuite: oneiric
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: oneiric-updates
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: oneiric-proposed
+ParentSuite: oneiric
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: oneiric-proposed
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: oneiric-backports
+ParentSuite: oneiric
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: oneiric-backports
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
+
+Suite: natty
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 11.04 'Natty Narwhal'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: natty
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 11.04 'Natty Narwhal'
+
+Suite: natty
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*11.04
+MatchURI: cdrom:\[Ubuntu.*11.04
+_Description: Cdrom with Ubuntu 11.04 'Natty Narwhal'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: natty
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: natty
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: natty-security
+ParentSuite: natty
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: natty-security
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: natty-updates
+ParentSuite: natty
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: natty-updates
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: natty-proposed
+ParentSuite: natty
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: natty-proposed
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: natty-backports
+ParentSuite: natty
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: natty-backports
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
 Suite: maverick
 RepositoryType: deb
 BaseURI: http://ports.ubuntu.com/ubuntu-ports/
@@ -13,18 +486,20 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 10.10 'Maverick Meerkat'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: maverick
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*10.10
 MatchURI: cdrom:\[Ubuntu.*10.10
@@ -94,18 +569,20 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 10.04 'Lucid Lynx'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: lucid
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*10.04
 MatchURI: cdrom:\[Ubuntu.*10.04
@@ -155,18 +632,20 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 9.10 'Karmic Koala'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: karmic
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*9.10
 MatchURI: cdrom:\[Ubuntu.*9.10
@@ -216,10 +695,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 9.04 'Jaunty Jackalope'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -228,6 +707,7 @@ _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: jaunty
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*9.04
 MatchURI: cdrom:\[Ubuntu.*9.04
@@ -277,18 +757,20 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 8.10 'Intrepid Ibex'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: intrepid
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*8.10
 MatchURI: cdrom:\[Ubuntu.*8.10
@@ -339,18 +821,20 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 8.04 'Hardy Heron'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: hardy
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*8.04
 MatchURI: cdrom:\[Ubuntu.*8.04
@@ -402,10 +886,10 @@ MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 7.10 'Gutsy Gibbon'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -414,6 +898,7 @@ _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: gutsy
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*7.10
 MatchURI: cdrom:\[Ubuntu.*7.10
@@ -465,10 +950,10 @@ MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 7.04 'Feisty Fawn'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -477,6 +962,7 @@ _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: feisty
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*7.04
 MatchURI: cdrom:\[Ubuntu.*7.04
@@ -525,10 +1011,10 @@ MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -537,6 +1023,7 @@ _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: edgy
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*6.10
 MatchURI: cdrom:\[Ubuntu.*6.10
@@ -585,10 +1072,10 @@ MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained (universe)
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -597,6 +1084,7 @@ _CompDescription: Restricted software (Multiverse)
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: dapper
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*6.06
 MatchURI: cdrom:\[Ubuntu.*6.06
@@ -653,6 +1141,7 @@ Component: multiverse
 _CompDescription: Non-free (Multiverse)
 
 Suite: breezy
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*5.10
 MatchURI: cdrom:\[Ubuntu.*5.10
@@ -704,6 +1193,7 @@ Component: multiverse
 _CompDescription: Non-free (Multiverse)
 
 Suite: hoary
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*5.04
 MatchURI: cdrom:\[Ubuntu.*5.04
@@ -750,6 +1240,7 @@ Component: multiverse
 _CompDescription: Non-free (Multiverse)
 
 Suite: warty
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*4.10
 MatchURI: cdrom:\[Ubuntu.*4.10