summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-09-18 14:43:26 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2008-09-18 14:43:26 +0200
commit17e8b974718928e8e5a1b80ac2c45e6f7ff98441 (patch)
tree3c9a3d0c3495b024f9f8fe788c6598b939413ca3 /data
parent6f6671a3375128c075a20927b58ad9d7b4bbb543 (diff)
parentd44831bb1d10ac1bc29690fd226209fb71b91b42 (diff)
downloadpython-apt-17e8b974718928e8e5a1b80ac2c45e6f7ff98441.tar.gz
* python/progress.cc:
- when pulse() does not return a boolean assume "true" (thanks to Martin Pitt for telling me about the problem) * aptsources/__init__.py, aptsources/distinfo.py: - run apt_pkg.init() when aptsources gets imported and not the distinfo function - fix detection of cdrom sources and add test for it
Diffstat (limited to 'data')
-rw-r--r--data/templates/Ubuntu.info.in9
1 files changed, 9 insertions, 0 deletions
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index c3cfe6df..97554fa8 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -25,6 +25,7 @@ _CompDescriptionLong: Software restricted by copyright or legal issues
Suite: intrepid
MatchName: .*
BaseURI: cdrom:\[Ubuntu.*8.10
+MatchURI: cdrom:\[Ubuntu.*8.10
_Description: Cdrom with Ubuntu 8.10 'Intrepid Ibex'
Available: False
Component: main
@@ -80,6 +81,7 @@ _CompDescriptionLong: Software restricted by copyright or legal issues
Suite: hardy
MatchName: .*
BaseURI: cdrom:\[Ubuntu.*8.04
+MatchURI: cdrom:\[Ubuntu.*8.04
_Description: Cdrom with Ubuntu 8.04 'Hardy Heron'
Available: False
Component: main
@@ -134,6 +136,7 @@ _CompDescriptionLong: Software restricted by copyright or legal issues
Suite: gutsy
MatchName: .*
BaseURI: cdrom:\[Ubuntu.*7.10
+MatchURI: cdrom:\[Ubuntu.*7.10
_Description: Cdrom with Ubuntu 7.10 'Gutsy Gibbon'
Available: False
Component: main
@@ -186,6 +189,7 @@ _CompDescriptionLong: Software restricted by copyright or legal issues
Suite: feisty
MatchName: .*
BaseURI: cdrom:\[Ubuntu.*7.04
+MatchURI: cdrom:\[Ubuntu.*7.04
_Description: Cdrom with Ubuntu 7.04 'Feisty Fawn'
Available: False
Component: main
@@ -237,6 +241,7 @@ _CompDescriptionLong: Software restricted by copyright or legal issues
Suite: edgy
MatchName: .*
BaseURI: cdrom:\[Ubuntu.*6.10
+MatchURI: cdrom:\[Ubuntu.*6.10
_Description: Cdrom with Ubuntu 6.10 'Edgy Eft'
Available: False
Component: main
@@ -288,6 +293,7 @@ _CompDescriptionLong: Software restricted by copyright or legal issues
Suite: dapper
MatchName: .*
BaseURI: cdrom:\[Ubuntu.*6.06
+MatchURI: cdrom:\[Ubuntu.*6.06
_Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'
Available: False
Component: main
@@ -335,6 +341,7 @@ _CompDescription: Non-free (Multiverse)
Suite: breezy
MatchName: .*
BaseURI: cdrom:\[Ubuntu.*5.10
+MatchURI: cdrom:\[Ubuntu.*5.10
_Description: Cdrom with Ubuntu 5.10 'Breezy Badger'
Available: False
Component: main
@@ -377,6 +384,7 @@ _CompDescription: Non-free (Multiverse)
Suite: hoary
MatchName: .*
BaseURI: cdrom:\[Ubuntu.*5.04
+MatchURI: cdrom:\[Ubuntu.*5.04
_Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog'
Available: False
Component: main
@@ -418,6 +426,7 @@ _CompDescription: Non-free (Multiverse)
Suite: warty
MatchName: .*
BaseURI: cdrom:\[Ubuntu.*4.10
+MatchURI: cdrom:\[Ubuntu.*4.10
_Description: Cdrom with Ubuntu 4.10 'Warty Warthog'
Available: False
Component: main