* Reuse the base_uri, match_uri and valid_mirrors property of the parent

  suite, if it was not declared explicitly for a child suite
* remove the obsolete enabled property from the channel templates

2 files changed, 2 insertions, 138 deletions

diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info
index 379da07d..4588a9b1 100644
--- a/data/channels/Ubuntu.info
+++ b/data/channels/Ubuntu.info
@@ -7,19 +7,15 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
-Enabled: 1
 CompDescription: Officially supported
 CompDescriptionLong: By Canonical supported Open Source software
 Component: universe
-Enabled: 0
 CompDescription: Community maintained
 CompDescriptionLong: Community maintained Open Source software
 Component: restricted
-Enabled: 1
 CompDescription: Non-free drivers
 CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
-Enabled: 0
 CompDescription: Restricted software
 CompDescriptionLong: By copyright or legal issues restricted software
 
@@ -29,10 +25,8 @@ BaseURI: cdrom:\[Ubuntu.*6.10
 Description: Cdrom with Ubuntu 6.10 'Edgy Eft'
 Available: False
 Component: main
-Enabled: 1
 CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 CompDescription: Restricted copyright
 
 Suite: edgy-security
@@ -40,31 +34,21 @@ ParentSuite: edgy
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Important security updates
 
 Suite: edgy-updates
 ParentSuite: edgy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Recommended updates
 
 Suite: edgy-proposed
 ParentSuite: edgy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Proposed updates
 
 Suite: edgy-backports
 ParentSuite: edgy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Backported updates
 
 Suite: dapper
@@ -74,19 +58,15 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
-Enabled: 1
 CompDescription: Officially supported
 CompDescriptionLong: By Canonical supported Open Source software
 Component: universe
-Enabled: 0
 CompDescription: Community maintained (universe)
 CompDescriptionLong: Community maintained Open Source software
 Component: restricted
-Enabled: 1
 CompDescription: Non-free drivers
 CompDescriptionLong: Proprietary drivers for devices 
 Component: multiverse
-Enabled: 0
 CompDescription: Restricted software (Multiverse)
 CompDescriptionLong: By copyright or legal issues restricted software
 
@@ -96,10 +76,8 @@ BaseURI: cdrom:\[Ubuntu.*6.06
 Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'
 Available: False
 Component: main
-Enabled: 1
 CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 CompDescription: Restricted copyright
 
 Suite: dapper-security
@@ -107,31 +85,21 @@ ParentSuite: dapper
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Important security updates
 
 Suite: dapper-updates
 ParentSuite: dapper
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Recommended updates
 
 Suite: dapper-proposed
 ParentSuite: dapper
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Proposed updates
 
 Suite: dapper-backports
 ParentSuite: dapper
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Backported updates
 
 Suite: breezy
@@ -141,16 +109,12 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.10 'Breezy Badger'
 Component: main
-Enabled: 1
 CompDescription: Officially supported
 Component: restricted
-Enabled: 1
 CompDescription: Restricted copyright
 Component: universe
-Enabled: 0
 CompDescription: Community maintained (Universe)
 Component: multiverse
-Enabled: 0
 CompDescription: Non-free (Multiverse)
 
 Suite: breezy
@@ -159,10 +123,8 @@ BaseURI: cdrom:\[Ubuntu.*5.10
 Description: Cdrom with Ubuntu 5.10 'Breezy Badger'
 Available: False
 Component: main
-Enabled: 1
 CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 CompDescription: Restricted copyright
 
 Suite: breezy-security
@@ -170,23 +132,16 @@ ParentSuite: breezy
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.10 Security Updates
 
 Suite: breezy-updates
 ParentSuite: breezy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.10 Updates
 
 Suite: breezy-backports
 ParentSuite: breezy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.10 Backports
 
 Suite: hoary
@@ -196,16 +151,12 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.04 'Hoary Hedgehog'
 Component: main
-Enabled: 1
 CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 CompDescription: Restricted copyright
 Component: universe
-Enabled: 0
 CompDescription: Community maintained (Universe)
 Component: multiverse
-Enabled: 0
 CompDescription: Non-free (Multiverse)
 
 Suite: hoary
@@ -214,10 +165,8 @@ BaseURI: cdrom:\[Ubuntu.*5.04
 Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog'
 Available: False
 Component: main
-Enabled: 1
 CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 CompDescription: Restricted copyright
 
 Suite: hoary-security
@@ -225,23 +174,16 @@ ParentSuite: hoary
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.04 Security Updates
 
 Suite: hoary-updates
 ParentSuite: hoary
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.04 Updates
 
 Suite: hoary-backports
 ParentSuite: hoary
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.04 Backports
 
 Suite: warty
@@ -250,16 +192,12 @@ BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
 Description: Ubuntu 4.10 'Warty Warthog'
 Component: main
-Enabled: 1
 CompDescription: No longer oficially supported
 Component: restricted
-Enabled: 1
 CompDescription: Restricted copyright
 Component: universe
-Enabled: 0
 CompDescription: Community maintained (Universe)
 Component: multiverse
-Enabled: 0
 CompDescription: Non-free (Multiverse)
 
 Suite: warty
@@ -268,29 +206,23 @@ BaseURI: cdrom:\[Ubuntu.*4.10
 Description: Cdrom with Ubuntu 4.10 'Warty Warthog'
 Available: False
 Component: main
-Enabled: 1
 CompDescription: No longer oficially supported
 Component: restricted
-Enabled: 1
 CompDescription: Restricted copyright
 
 Suite: warty-security
 ParentSuite: warty
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
 Description: Ubuntu 4.10 Security Updates
 
 Suite: warty-updates
 ParentSuite: warty
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
 Description: Ubuntu 4.10 Updates
 
 Suite: warty-backports
 ParentSuite: warty
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
 Description: Ubuntu 4.10 Backports
diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in
index 2b20cf8f..d6070790 100644
--- a/data/channels/Ubuntu.info.in
+++ b/data/channels/Ubuntu.info.in
@@ -7,19 +7,15 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
-Enabled: 1
 _CompDescription: Officially supported
 _CompDescriptionLong: By Canonical supported Open Source software
 Component: universe
-Enabled: 0
 _CompDescription: Community maintained
 _CompDescriptionLong: Community maintained Open Source software
 Component: restricted
-Enabled: 1
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
-Enabled: 0
 _CompDescription: Restricted software
 _CompDescriptionLong: By copyright or legal issues restricted software
 
@@ -29,10 +25,8 @@ BaseURI: cdrom:\[Ubuntu.*6.10
 _Description: Cdrom with Ubuntu 6.10 'Edgy Eft'
 Available: False
 Component: main
-Enabled: 1
 _CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 _CompDescription: Restricted copyright
 
 Suite: edgy-security
@@ -40,31 +34,21 @@ ParentSuite: edgy
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Important security updates
 
 Suite: edgy-updates
 ParentSuite: edgy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Recommended updates
 
 Suite: edgy-proposed
 ParentSuite: edgy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Proposed updates
 
 Suite: edgy-backports
 ParentSuite: edgy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Backported updates
 
 Suite: dapper
@@ -74,19 +58,15 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
-Enabled: 1
 _CompDescription: Officially supported
 _CompDescriptionLong: By Canonical supported Open Source software
 Component: universe
-Enabled: 0
 _CompDescription: Community maintained (universe)
 _CompDescriptionLong: Community maintained Open Source software
 Component: restricted
-Enabled: 1
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices 
 Component: multiverse
-Enabled: 0
 _CompDescription: Restricted software (Multiverse)
 _CompDescriptionLong: By copyright or legal issues restricted software
 
@@ -96,10 +76,8 @@ BaseURI: cdrom:\[Ubuntu.*6.06
 _Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'
 Available: False
 Component: main
-Enabled: 1
 _CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 _CompDescription: Restricted copyright
 
 Suite: dapper-security
@@ -107,31 +85,21 @@ ParentSuite: dapper
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Important security updates
 
 Suite: dapper-updates
 ParentSuite: dapper
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Recommended updates
 
 Suite: dapper-proposed
 ParentSuite: dapper
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Proposed updates
 
 Suite: dapper-backports
 ParentSuite: dapper
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Backported updates
 
 Suite: breezy
@@ -141,16 +109,12 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 5.10 'Breezy Badger'
 Component: main
-Enabled: 1
 _CompDescription: Officially supported
 Component: restricted
-Enabled: 1
 _CompDescription: Restricted copyright
 Component: universe
-Enabled: 0
 _CompDescription: Community maintained (Universe)
 Component: multiverse
-Enabled: 0
 _CompDescription: Non-free (Multiverse)
 
 Suite: breezy
@@ -159,10 +123,8 @@ BaseURI: cdrom:\[Ubuntu.*5.10
 _Description: Cdrom with Ubuntu 5.10 'Breezy Badger'
 Available: False
 Component: main
-Enabled: 1
 _CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 _CompDescription: Restricted copyright
 
 Suite: breezy-security
@@ -170,23 +132,16 @@ ParentSuite: breezy
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 5.10 Security Updates
 
 Suite: breezy-updates
 ParentSuite: breezy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 5.10 Updates
 
 Suite: breezy-backports
 ParentSuite: breezy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 5.10 Backports
 
 Suite: hoary
@@ -196,16 +151,12 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 5.04 'Hoary Hedgehog'
 Component: main
-Enabled: 1
 _CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 _CompDescription: Restricted copyright
 Component: universe
-Enabled: 0
 _CompDescription: Community maintained (Universe)
 Component: multiverse
-Enabled: 0
 _CompDescription: Non-free (Multiverse)
 
 Suite: hoary
@@ -214,10 +165,8 @@ BaseURI: cdrom:\[Ubuntu.*5.04
 _Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog'
 Available: False
 Component: main
-Enabled: 1
 _CompDescription: Oficially supported
 Component: restricted
-Enabled: 1
 _CompDescription: Restricted copyright
 
 Suite: hoary-security
@@ -225,23 +174,16 @@ ParentSuite: hoary
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 5.04 Security Updates
 
 Suite: hoary-updates
 ParentSuite: hoary
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 5.04 Updates
 
 Suite: hoary-backports
 ParentSuite: hoary
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 5.04 Backports
 
 Suite: warty
@@ -250,16 +192,12 @@ BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
 _Description: Ubuntu 4.10 'Warty Warthog'
 Component: main
-Enabled: 1
 _CompDescription: No longer oficially supported
 Component: restricted
-Enabled: 1
 _CompDescription: Restricted copyright
 Component: universe
-Enabled: 0
 _CompDescription: Community maintained (Universe)
 Component: multiverse
-Enabled: 0
 _CompDescription: Non-free (Multiverse)
 
 Suite: warty
@@ -268,29 +206,23 @@ BaseURI: cdrom:\[Ubuntu.*4.10
 _Description: Cdrom with Ubuntu 4.10 'Warty Warthog'
 Available: False
 Component: main
-Enabled: 1
 _CompDescription: No longer oficially supported
 Component: restricted
-Enabled: 1
 _CompDescription: Restricted copyright
 
 Suite: warty-security
 ParentSuite: warty
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com
+MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
 _Description: Ubuntu 4.10 Security Updates
 
 Suite: warty-updates
 ParentSuite: warty
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
 _Description: Ubuntu 4.10 Updates
 
 Suite: warty-backports
 ParentSuite: warty
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
 _Description: Ubuntu 4.10 Backports