Merge lp:~persia/python-apt/hardy+bf531876 into lp:~ubuntu-core-dev/python-apt/hardy

Proposed by Emmet Hikory
Status: Merged
Merged at revision: not available
Proposed branch: lp:~persia/python-apt/hardy+bf531876
Merge into: lp:~ubuntu-core-dev/python-apt/hardy
Diff against target: 270 lines (+85/-13)
2 files modified
data/templates/Ubuntu.info.in (+77/-13)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~persia/python-apt/hardy+bf531876
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+20810@code.launchpad.net
To post a comment you must log in.
lp:~persia/python-apt/hardy+bf531876 updated
272. By Emmet Hikory

Update based on guidance from cjwatson

Revision history for this message
Michael Vogt (mvo) wrote :

Merged, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/templates/Ubuntu.info.in'
--- data/templates/Ubuntu.info.in 2008-11-10 09:44:53 +0000
+++ data/templates/Ubuntu.info.in 2010-03-09 10:17:27 +0000
@@ -2,10 +2,12 @@
22
3Suite: hardy3Suite: hardy
4RepositoryType: deb4RepositoryType: deb
5BaseURI: http://archive.ubuntu.com/ubuntu/5BaseURI: http://ports.ubuntu.com/ubuntu-ports
6MatchURI: archive.ubuntu.com/ubuntu6MatchURI: ports.ubuntu.com/ubuntu-ports
7BaseURI-powerpc: http://ports.ubuntu.com/7BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
8MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com8MatchURI-amd64: archive.ubuntu.com/ubuntu
9BaseURI-i386: http://archive.ubuntu.com/ubuntu/
10MatchURI-i386: archive.ubuntu.com/ubuntu
9MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors11MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
10MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors12MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
11_Description: Ubuntu 8.04 'Hardy Heron'13_Description: Ubuntu 8.04 'Hardy Heron'
@@ -25,6 +27,7 @@
25Suite: hardy27Suite: hardy
26MatchName: .*28MatchName: .*
27BaseURI: cdrom:\[Ubuntu.*8.0429BaseURI: cdrom:\[Ubuntu.*8.04
30MatchURI: cdrom:\[Ubuntu.*8.04
28_Description: Cdrom with Ubuntu 8.04 'Hardy Heron'31_Description: Cdrom with Ubuntu 8.04 'Hardy Heron'
29Available: False32Available: False
30Component: main33Component: main
@@ -35,10 +38,12 @@
35Suite: hardy-security38Suite: hardy-security
36ParentSuite: hardy39ParentSuite: hardy
37RepositoryType: deb40RepositoryType: deb
38BaseURI: http://security.ubuntu.com/ubuntu/41BaseURI: http://ports.ubuntu.com/
39MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com42MatchURI: ports.ubuntu.com/ubuntu-ports
40BaseURI-powerpc: http://ports.ubuntu.com/43BaseURI-amd64: http://security.ubuntu.com/ubuntu/
41MatchURI-powerpc: ports.ubuntu.com/ubuntu44MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
45BaseURI-i386: http://security.ubuntu.com/ubuntu/
46MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
42_Description: Important security updates47_Description: Important security updates
4348
44Suite: hardy-updates49Suite: hardy-updates
@@ -59,8 +64,14 @@
5964
60Suite: gutsy65Suite: gutsy
61RepositoryType: deb66RepositoryType: deb
62BaseURI: http://archive.ubuntu.com/ubuntu/67BaseURI: http://ports.ubuntu.com/
63MatchURI: archive.ubuntu.com/ubuntu68MatchURI: ports.ubuntu.com/ubuntu-ports
69BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
70MatchURI-amd64: archive.ubuntu.com/ubuntu
71BaseURI-i386: http://archive.ubuntu.com/ubuntu/
72MatchURI-i386: archive.ubuntu.com/ubuntu
73BaseURI-sparc: http://archive.ubuntu.com/ubuntu/
74MatchURI-sparc: archive.ubuntu.com/ubuntu
64MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors75MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
65_Description: Ubuntu 7.10 'Gutsy Gibbon'76_Description: Ubuntu 7.10 'Gutsy Gibbon'
66Component: main77Component: main
@@ -79,6 +90,7 @@
79Suite: gutsy90Suite: gutsy
80MatchName: .*91MatchName: .*
81BaseURI: cdrom:\[Ubuntu.*7.1092BaseURI: cdrom:\[Ubuntu.*7.10
93MatchURI: cdrom:\[Ubuntu.*7.10
82_Description: Cdrom with Ubuntu 7.10 'Gutsy Gibbon'94_Description: Cdrom with Ubuntu 7.10 'Gutsy Gibbon'
83Available: False95Available: False
84Component: main96Component: main
@@ -89,8 +101,14 @@
89Suite: gutsy-security101Suite: gutsy-security
90ParentSuite: gutsy102ParentSuite: gutsy
91RepositoryType: deb103RepositoryType: deb
92BaseURI: http://security.ubuntu.com/ubuntu/104BaseURI: http://ports.ubuntu.com/
93MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com105MatchURI: ports.ubuntu.com/ubuntu-ports
106BaseURI-amd64: http://security.ubuntu.com/ubuntu/
107MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
108BaseURI-i386: http://security.ubuntu.com/ubuntu/
109MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
110BaseURI-sparc: http://security.ubuntu.com/ubuntu/
111MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com
94_Description: Important security updates112_Description: Important security updates
95113
96Suite: gutsy-updates114Suite: gutsy-updates
@@ -113,6 +131,10 @@
113RepositoryType: deb131RepositoryType: deb
114BaseURI: http://archive.ubuntu.com/ubuntu/132BaseURI: http://archive.ubuntu.com/ubuntu/
115MatchURI: archive.ubuntu.com/ubuntu133MatchURI: archive.ubuntu.com/ubuntu
134BaseURI-ia64: http://ports.ubuntu.com/
135MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
136BaseURI-hppa: http://ports.ubuntu.com/
137MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
116MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors138MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
117_Description: Ubuntu 7.04 'Feisty Fawn'139_Description: Ubuntu 7.04 'Feisty Fawn'
118Component: main140Component: main
@@ -131,6 +153,7 @@
131Suite: feisty153Suite: feisty
132MatchName: .*154MatchName: .*
133BaseURI: cdrom:\[Ubuntu.*7.04155BaseURI: cdrom:\[Ubuntu.*7.04
156MatchURI: cdrom:\[Ubuntu.*7.04
134_Description: Cdrom with Ubuntu 7.04 'Feisty Fawn'157_Description: Cdrom with Ubuntu 7.04 'Feisty Fawn'
135Available: False158Available: False
136Component: main159Component: main
@@ -143,6 +166,10 @@
143RepositoryType: deb166RepositoryType: deb
144BaseURI: http://security.ubuntu.com/ubuntu/167BaseURI: http://security.ubuntu.com/ubuntu/
145MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com168MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
169BaseURI-ia64: http://ports.ubuntu.com/
170MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
171BaseURI-hppa: http://ports.ubuntu.com/
172MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
146_Description: Important security updates173_Description: Important security updates
147174
148Suite: feisty-updates175Suite: feisty-updates
@@ -164,6 +191,10 @@
164RepositoryType: deb191RepositoryType: deb
165BaseURI: http://archive.ubuntu.com/ubuntu/192BaseURI: http://archive.ubuntu.com/ubuntu/
166MatchURI: archive.ubuntu.com/ubuntu193MatchURI: archive.ubuntu.com/ubuntu
194BaseURI-ia64: http://ports.ubuntu.com/
195MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
196BaseURI-hppa: http://ports.ubuntu.com/
197MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
167MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors198MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
168_Description: Ubuntu 6.10 'Edgy Eft'199_Description: Ubuntu 6.10 'Edgy Eft'
169Component: main200Component: main
@@ -182,6 +213,7 @@
182Suite: edgy213Suite: edgy
183MatchName: .*214MatchName: .*
184BaseURI: cdrom:\[Ubuntu.*6.10215BaseURI: cdrom:\[Ubuntu.*6.10
216MatchURI: cdrom:\[Ubuntu.*6.10
185_Description: Cdrom with Ubuntu 6.10 'Edgy Eft'217_Description: Cdrom with Ubuntu 6.10 'Edgy Eft'
186Available: False218Available: False
187Component: main219Component: main
@@ -194,6 +226,10 @@
194RepositoryType: deb226RepositoryType: deb
195BaseURI: http://security.ubuntu.com/ubuntu/227BaseURI: http://security.ubuntu.com/ubuntu/
196MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com228MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
229BaseURI-ia64: http://ports.ubuntu.com/
230MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
231BaseURI-hppa: http://ports.ubuntu.com/
232MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
197_Description: Important security updates233_Description: Important security updates
198234
199Suite: edgy-updates235Suite: edgy-updates
@@ -215,6 +251,10 @@
215RepositoryType: deb251RepositoryType: deb
216BaseURI: http://archive.ubuntu.com/ubuntu/252BaseURI: http://archive.ubuntu.com/ubuntu/
217MatchURI: archive.ubuntu.com/ubuntu253MatchURI: archive.ubuntu.com/ubuntu
254BaseURI-ia64: http://ports.ubuntu.com/
255MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
256BaseURI-hppa: http://ports.ubuntu.com/
257MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
218MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors258MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
219_Description: Ubuntu 6.06 LTS 'Dapper Drake'259_Description: Ubuntu 6.06 LTS 'Dapper Drake'
220Component: main260Component: main
@@ -225,7 +265,7 @@
225_CompDescriptionLong: Community-maintained Open Source software265_CompDescriptionLong: Community-maintained Open Source software
226Component: restricted266Component: restricted
227_CompDescription: Non-free drivers267_CompDescription: Non-free drivers
228_CompDescriptionLong: Proprietary drivers for devices 268_CompDescriptionLong: Proprietary drivers for devices
229Component: multiverse269Component: multiverse
230_CompDescription: Restricted software (Multiverse)270_CompDescription: Restricted software (Multiverse)
231_CompDescriptionLong: Software restricted by copyright or legal issues271_CompDescriptionLong: Software restricted by copyright or legal issues
@@ -233,6 +273,7 @@
233Suite: dapper273Suite: dapper
234MatchName: .*274MatchName: .*
235BaseURI: cdrom:\[Ubuntu.*6.06275BaseURI: cdrom:\[Ubuntu.*6.06
276MatchURI: cdrom:\[Ubuntu.*6.06
236_Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'277_Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'
237Available: False278Available: False
238Component: main279Component: main
@@ -245,6 +286,10 @@
245RepositoryType: deb286RepositoryType: deb
246BaseURI: http://security.ubuntu.com/ubuntu/287BaseURI: http://security.ubuntu.com/ubuntu/
247MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com288MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
289BaseURI-ia64: http://ports.ubuntu.com/
290MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
291BaseURI-hppa: http://ports.ubuntu.com/
292MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
248_Description: Important security updates293_Description: Important security updates
249294
250Suite: dapper-updates295Suite: dapper-updates
@@ -267,6 +312,10 @@
267BaseURI: http://archive.ubuntu.com/ubuntu/312BaseURI: http://archive.ubuntu.com/ubuntu/
268MatchURI: archive.ubuntu.com/ubuntu313MatchURI: archive.ubuntu.com/ubuntu
269MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors314MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
315BaseURI-ia64: http://ports.ubuntu.com/
316MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
317BaseURI-hppa: http://ports.ubuntu.com/
318MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
270_Description: Ubuntu 5.10 'Breezy Badger'319_Description: Ubuntu 5.10 'Breezy Badger'
271Component: main320Component: main
272_CompDescription: Officially supported321_CompDescription: Officially supported
@@ -280,6 +329,7 @@
280Suite: breezy329Suite: breezy
281MatchName: .*330MatchName: .*
282BaseURI: cdrom:\[Ubuntu.*5.10331BaseURI: cdrom:\[Ubuntu.*5.10
332MatchURI: cdrom:\[Ubuntu.*5.10
283_Description: Cdrom with Ubuntu 5.10 'Breezy Badger'333_Description: Cdrom with Ubuntu 5.10 'Breezy Badger'
284Available: False334Available: False
285Component: main335Component: main
@@ -292,6 +342,10 @@
292RepositoryType: deb342RepositoryType: deb
293BaseURI: http://security.ubuntu.com/ubuntu/343BaseURI: http://security.ubuntu.com/ubuntu/
294MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com344MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
345BaseURI-ia64: http://ports.ubuntu.com/
346MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
347BaseURI-hppa: http://ports.ubuntu.com/
348MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
295_Description: Ubuntu 5.10 Security Updates349_Description: Ubuntu 5.10 Security Updates
296350
297Suite: breezy-updates351Suite: breezy-updates
@@ -308,6 +362,10 @@
308RepositoryType: deb362RepositoryType: deb
309BaseURI: http://archive.ubuntu.com/ubuntu/363BaseURI: http://archive.ubuntu.com/ubuntu/
310MatchURI: archive.ubuntu.com/ubuntu364MatchURI: archive.ubuntu.com/ubuntu
365BaseURI-ia64: http://ports.ubuntu.com/
366MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
367BaseURI-hppa: http://ports.ubuntu.com/
368MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
311MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors369MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
312_Description: Ubuntu 5.04 'Hoary Hedgehog'370_Description: Ubuntu 5.04 'Hoary Hedgehog'
313Component: main371Component: main
@@ -322,6 +380,7 @@
322Suite: hoary380Suite: hoary
323MatchName: .*381MatchName: .*
324BaseURI: cdrom:\[Ubuntu.*5.04382BaseURI: cdrom:\[Ubuntu.*5.04
383MatchURI: cdrom:\[Ubuntu.*5.04
325_Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog'384_Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog'
326Available: False385Available: False
327Component: main386Component: main
@@ -334,6 +393,10 @@
334RepositoryType: deb393RepositoryType: deb
335BaseURI: http://security.ubuntu.com/ubuntu/394BaseURI: http://security.ubuntu.com/ubuntu/
336MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com395MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
396BaseURI-ia64: http://ports.ubuntu.com/
397MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
398BaseURI-hppa: http://ports.ubuntu.com/
399MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
337_Description: Ubuntu 5.04 Security Updates400_Description: Ubuntu 5.04 Security Updates
338401
339Suite: hoary-updates402Suite: hoary-updates
@@ -363,6 +426,7 @@
363Suite: warty426Suite: warty
364MatchName: .*427MatchName: .*
365BaseURI: cdrom:\[Ubuntu.*4.10428BaseURI: cdrom:\[Ubuntu.*4.10
429MatchURI: cdrom:\[Ubuntu.*4.10
366_Description: Cdrom with Ubuntu 4.10 'Warty Warthog'430_Description: Cdrom with Ubuntu 4.10 'Warty Warthog'
367Available: False431Available: False
368Component: main432Component: main
369433
=== modified file 'debian/changelog'
--- debian/changelog 2009-01-27 10:46:20 +0000
+++ debian/changelog 2010-03-09 10:17:27 +0000
@@ -1,3 +1,11 @@
1python-apt (0.7.4ubuntu7.6) hardy-proposed; urgency=low
2
3 * data/templates/Ubuntu.info.in: (LP: #531876)
4 - refactor to use ports by default for gutsy and newer releases
5 - Set appropriate exceptions to defaults for warty-hardy
6
7 -- Emmet Hikory <persia@ubuntu.com> Sat, 06 Mar 2010 07:42:31 +0900
8
1python-apt (0.7.4ubuntu7.5) hardy-proposed; urgency=low9python-apt (0.7.4ubuntu7.5) hardy-proposed; urgency=low
210
3 * aptsources/__init__.py, aptsources/distinfo.py:11 * aptsources/__init__.py, aptsources/distinfo.py:

Subscribers

People subscribed via source and target branches

to all changes: