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 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 on 2010-03-09

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
1=== modified file 'data/templates/Ubuntu.info.in'
2--- data/templates/Ubuntu.info.in 2008-11-10 09:44:53 +0000
3+++ data/templates/Ubuntu.info.in 2010-03-09 10:17:27 +0000
4@@ -2,10 +2,12 @@
5
6 Suite: hardy
7 RepositoryType: deb
8-BaseURI: http://archive.ubuntu.com/ubuntu/
9-MatchURI: archive.ubuntu.com/ubuntu
10-BaseURI-powerpc: http://ports.ubuntu.com/
11-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
12+BaseURI: http://ports.ubuntu.com/ubuntu-ports
13+MatchURI: ports.ubuntu.com/ubuntu-ports
14+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
15+MatchURI-amd64: archive.ubuntu.com/ubuntu
16+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
17+MatchURI-i386: archive.ubuntu.com/ubuntu
18 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
19 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
20 _Description: Ubuntu 8.04 'Hardy Heron'
21@@ -25,6 +27,7 @@
22 Suite: hardy
23 MatchName: .*
24 BaseURI: cdrom:\[Ubuntu.*8.04
25+MatchURI: cdrom:\[Ubuntu.*8.04
26 _Description: Cdrom with Ubuntu 8.04 'Hardy Heron'
27 Available: False
28 Component: main
29@@ -35,10 +38,12 @@
30 Suite: hardy-security
31 ParentSuite: hardy
32 RepositoryType: deb
33-BaseURI: http://security.ubuntu.com/ubuntu/
34-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
35-BaseURI-powerpc: http://ports.ubuntu.com/
36-MatchURI-powerpc: ports.ubuntu.com/ubuntu
37+BaseURI: http://ports.ubuntu.com/
38+MatchURI: ports.ubuntu.com/ubuntu-ports
39+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
40+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
41+BaseURI-i386: http://security.ubuntu.com/ubuntu/
42+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
43 _Description: Important security updates
44
45 Suite: hardy-updates
46@@ -59,8 +64,14 @@
47
48 Suite: gutsy
49 RepositoryType: deb
50-BaseURI: http://archive.ubuntu.com/ubuntu/
51-MatchURI: archive.ubuntu.com/ubuntu
52+BaseURI: http://ports.ubuntu.com/
53+MatchURI: ports.ubuntu.com/ubuntu-ports
54+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
55+MatchURI-amd64: archive.ubuntu.com/ubuntu
56+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
57+MatchURI-i386: archive.ubuntu.com/ubuntu
58+BaseURI-sparc: http://archive.ubuntu.com/ubuntu/
59+MatchURI-sparc: archive.ubuntu.com/ubuntu
60 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
61 _Description: Ubuntu 7.10 'Gutsy Gibbon'
62 Component: main
63@@ -79,6 +90,7 @@
64 Suite: gutsy
65 MatchName: .*
66 BaseURI: cdrom:\[Ubuntu.*7.10
67+MatchURI: cdrom:\[Ubuntu.*7.10
68 _Description: Cdrom with Ubuntu 7.10 'Gutsy Gibbon'
69 Available: False
70 Component: main
71@@ -89,8 +101,14 @@
72 Suite: gutsy-security
73 ParentSuite: gutsy
74 RepositoryType: deb
75-BaseURI: http://security.ubuntu.com/ubuntu/
76-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
77+BaseURI: http://ports.ubuntu.com/
78+MatchURI: ports.ubuntu.com/ubuntu-ports
79+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
80+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
81+BaseURI-i386: http://security.ubuntu.com/ubuntu/
82+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
83+BaseURI-sparc: http://security.ubuntu.com/ubuntu/
84+MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com
85 _Description: Important security updates
86
87 Suite: gutsy-updates
88@@ -113,6 +131,10 @@
89 RepositoryType: deb
90 BaseURI: http://archive.ubuntu.com/ubuntu/
91 MatchURI: archive.ubuntu.com/ubuntu
92+BaseURI-ia64: http://ports.ubuntu.com/
93+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
94+BaseURI-hppa: http://ports.ubuntu.com/
95+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
96 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
97 _Description: Ubuntu 7.04 'Feisty Fawn'
98 Component: main
99@@ -131,6 +153,7 @@
100 Suite: feisty
101 MatchName: .*
102 BaseURI: cdrom:\[Ubuntu.*7.04
103+MatchURI: cdrom:\[Ubuntu.*7.04
104 _Description: Cdrom with Ubuntu 7.04 'Feisty Fawn'
105 Available: False
106 Component: main
107@@ -143,6 +166,10 @@
108 RepositoryType: deb
109 BaseURI: http://security.ubuntu.com/ubuntu/
110 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
111+BaseURI-ia64: http://ports.ubuntu.com/
112+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
113+BaseURI-hppa: http://ports.ubuntu.com/
114+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
115 _Description: Important security updates
116
117 Suite: feisty-updates
118@@ -164,6 +191,10 @@
119 RepositoryType: deb
120 BaseURI: http://archive.ubuntu.com/ubuntu/
121 MatchURI: archive.ubuntu.com/ubuntu
122+BaseURI-ia64: http://ports.ubuntu.com/
123+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
124+BaseURI-hppa: http://ports.ubuntu.com/
125+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
126 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
127 _Description: Ubuntu 6.10 'Edgy Eft'
128 Component: main
129@@ -182,6 +213,7 @@
130 Suite: edgy
131 MatchName: .*
132 BaseURI: cdrom:\[Ubuntu.*6.10
133+MatchURI: cdrom:\[Ubuntu.*6.10
134 _Description: Cdrom with Ubuntu 6.10 'Edgy Eft'
135 Available: False
136 Component: main
137@@ -194,6 +226,10 @@
138 RepositoryType: deb
139 BaseURI: http://security.ubuntu.com/ubuntu/
140 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
141+BaseURI-ia64: http://ports.ubuntu.com/
142+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
143+BaseURI-hppa: http://ports.ubuntu.com/
144+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
145 _Description: Important security updates
146
147 Suite: edgy-updates
148@@ -215,6 +251,10 @@
149 RepositoryType: deb
150 BaseURI: http://archive.ubuntu.com/ubuntu/
151 MatchURI: archive.ubuntu.com/ubuntu
152+BaseURI-ia64: http://ports.ubuntu.com/
153+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
154+BaseURI-hppa: http://ports.ubuntu.com/
155+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
156 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
157 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
158 Component: main
159@@ -225,7 +265,7 @@
160 _CompDescriptionLong: Community-maintained Open Source software
161 Component: restricted
162 _CompDescription: Non-free drivers
163-_CompDescriptionLong: Proprietary drivers for devices
164+_CompDescriptionLong: Proprietary drivers for devices
165 Component: multiverse
166 _CompDescription: Restricted software (Multiverse)
167 _CompDescriptionLong: Software restricted by copyright or legal issues
168@@ -233,6 +273,7 @@
169 Suite: dapper
170 MatchName: .*
171 BaseURI: cdrom:\[Ubuntu.*6.06
172+MatchURI: cdrom:\[Ubuntu.*6.06
173 _Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'
174 Available: False
175 Component: main
176@@ -245,6 +286,10 @@
177 RepositoryType: deb
178 BaseURI: http://security.ubuntu.com/ubuntu/
179 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
180+BaseURI-ia64: http://ports.ubuntu.com/
181+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
182+BaseURI-hppa: http://ports.ubuntu.com/
183+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
184 _Description: Important security updates
185
186 Suite: dapper-updates
187@@ -267,6 +312,10 @@
188 BaseURI: http://archive.ubuntu.com/ubuntu/
189 MatchURI: archive.ubuntu.com/ubuntu
190 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
191+BaseURI-ia64: http://ports.ubuntu.com/
192+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
193+BaseURI-hppa: http://ports.ubuntu.com/
194+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
195 _Description: Ubuntu 5.10 'Breezy Badger'
196 Component: main
197 _CompDescription: Officially supported
198@@ -280,6 +329,7 @@
199 Suite: breezy
200 MatchName: .*
201 BaseURI: cdrom:\[Ubuntu.*5.10
202+MatchURI: cdrom:\[Ubuntu.*5.10
203 _Description: Cdrom with Ubuntu 5.10 'Breezy Badger'
204 Available: False
205 Component: main
206@@ -292,6 +342,10 @@
207 RepositoryType: deb
208 BaseURI: http://security.ubuntu.com/ubuntu/
209 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
210+BaseURI-ia64: http://ports.ubuntu.com/
211+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
212+BaseURI-hppa: http://ports.ubuntu.com/
213+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
214 _Description: Ubuntu 5.10 Security Updates
215
216 Suite: breezy-updates
217@@ -308,6 +362,10 @@
218 RepositoryType: deb
219 BaseURI: http://archive.ubuntu.com/ubuntu/
220 MatchURI: archive.ubuntu.com/ubuntu
221+BaseURI-ia64: http://ports.ubuntu.com/
222+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
223+BaseURI-hppa: http://ports.ubuntu.com/
224+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
225 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
226 _Description: Ubuntu 5.04 'Hoary Hedgehog'
227 Component: main
228@@ -322,6 +380,7 @@
229 Suite: hoary
230 MatchName: .*
231 BaseURI: cdrom:\[Ubuntu.*5.04
232+MatchURI: cdrom:\[Ubuntu.*5.04
233 _Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog'
234 Available: False
235 Component: main
236@@ -334,6 +393,10 @@
237 RepositoryType: deb
238 BaseURI: http://security.ubuntu.com/ubuntu/
239 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
240+BaseURI-ia64: http://ports.ubuntu.com/
241+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
242+BaseURI-hppa: http://ports.ubuntu.com/
243+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
244 _Description: Ubuntu 5.04 Security Updates
245
246 Suite: hoary-updates
247@@ -363,6 +426,7 @@
248 Suite: warty
249 MatchName: .*
250 BaseURI: cdrom:\[Ubuntu.*4.10
251+MatchURI: cdrom:\[Ubuntu.*4.10
252 _Description: Cdrom with Ubuntu 4.10 'Warty Warthog'
253 Available: False
254 Component: main
255
256=== modified file 'debian/changelog'
257--- debian/changelog 2009-01-27 10:46:20 +0000
258+++ debian/changelog 2010-03-09 10:17:27 +0000
259@@ -1,3 +1,11 @@
260+python-apt (0.7.4ubuntu7.6) hardy-proposed; urgency=low
261+
262+ * data/templates/Ubuntu.info.in: (LP: #531876)
263+ - refactor to use ports by default for gutsy and newer releases
264+ - Set appropriate exceptions to defaults for warty-hardy
265+
266+ -- Emmet Hikory <persia@ubuntu.com> Sat, 06 Mar 2010 07:42:31 +0900
267+
268 python-apt (0.7.4ubuntu7.5) hardy-proposed; urgency=low
269
270 * aptsources/__init__.py, aptsources/distinfo.py:

Subscribers

People subscribed via source and target branches

to all changes: