the python apt bindings

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

  1. lucid+bf531876
  2. Merge into ubuntu
Proposed by Emmet Hikory
Status: Merged
Merged at revision: not available
Proposed branch: lp:~persia/python-apt/lucid+bf531876
Merge into: lp:~ubuntu-core-dev/python-apt/ubuntu
Diff against target: 368 lines (+124/-76)
2 files modified
data/templates/Ubuntu.info.in (+116/-74)
debian/changelog (+8/-2)
To merge this branch: bzr merge lp:~persia/python-apt/lucid+bf531876
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+20806@code.launchpad.net

Description of the change

This is failing to build for me on lucid today, but so is 0.7.13.4ubuntu4 and I believe the FTBFS to be unrelated to my changes. Unfortunately, I've not figured out how to fix it yet.

To post a comment you must log in.
lp:~persia/python-apt/lucid+bf531876 updated
342. 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
1=== modified file 'data/templates/Ubuntu.info.in'
2--- data/templates/Ubuntu.info.in 2010-03-04 12:14:07 +0000
3+++ data/templates/Ubuntu.info.in 2010-03-09 10:28:28 +0000
4@@ -2,14 +2,12 @@
5
6 Suite: lucid
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-lpia: http://ports.ubuntu.com/
13-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
14-BaseURI-armel: http://ports.ubuntu.com/
15-MatchURI-armel: ports.ubuntu.com|archive.ubuntu.com
16+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
17+MatchURI: ports.ubuntu.com/ubuntu-ports
18+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
19+MatchURI-amd64: archive.ubuntu.com/ubuntu
20+BaseURI-i386: http://archive.ubuntu.com/ubuntu
21+MatchURI-i386: archive.ubuntu.com/ubuntu
22 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
23 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
24 _Description: Ubuntu 10.04 'Lucid Lynx'
25@@ -40,14 +38,12 @@
26 Suite: lucid-security
27 ParentSuite: lucid
28 RepositoryType: deb
29-BaseURI: http://security.ubuntu.com/ubuntu/
30-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
31-BaseURI-powerpc: http://ports.ubuntu.com/
32-MatchURI-powerpc: ports.ubuntu.com/ubuntu
33-BaseURI-lpia: http://ports.ubuntu.com/
34-MatchURI-lpia: ports.ubuntu.com/ubuntu
35-BaseURI-armel: http://ports.ubuntu.com/
36-MatchURI-armel: ports.ubuntu.com/ubuntu
37+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
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: lucid-updates
46@@ -67,14 +63,12 @@
47
48 Suite: karmic
49 RepositoryType: deb
50-BaseURI: http://archive.ubuntu.com/ubuntu/
51-MatchURI: archive.ubuntu.com/ubuntu
52-BaseURI-powerpc: http://ports.ubuntu.com/
53-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
54-BaseURI-lpia: http://ports.ubuntu.com/
55-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
56-BaseURI-armel: http://ports.ubuntu.com/
57-MatchURI-armel: ports.ubuntu.com|archive.ubuntu.com
58+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
59+MatchURI: ports.ubuntu.com/ubuntu-ports
60+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
61+MatchURI-amd64: archive.ubuntu.com/ubuntu
62+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
63+MatchURI-i386: archive.ubuntu.com/ubuntu
64 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
65 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
66 _Description: Ubuntu 9.10 'Karmic Koala'
67@@ -105,14 +99,12 @@
68 Suite: karmic-security
69 ParentSuite: karmic
70 RepositoryType: deb
71-BaseURI: http://security.ubuntu.com/ubuntu/
72-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
73-BaseURI-powerpc: http://ports.ubuntu.com/
74-MatchURI-powerpc: ports.ubuntu.com/ubuntu
75-BaseURI-lpia: http://ports.ubuntu.com/
76-MatchURI-lpia: ports.ubuntu.com/ubuntu
77-BaseURI-armel: http://ports.ubuntu.com/
78-MatchURI-armel: ports.ubuntu.com/ubuntu
79+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
80+MatchURI: ports.ubuntu.com/ubuntu-ports
81+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
82+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
83+BaseURI-i386: http://security.ubuntu.com/ubuntu/
84+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
85 _Description: Important security updates
86
87 Suite: karmic-updates
88@@ -132,14 +124,12 @@
89
90 Suite: jaunty
91 RepositoryType: deb
92-BaseURI: http://archive.ubuntu.com/ubuntu/
93-MatchURI: archive.ubuntu.com/ubuntu
94-BaseURI-powerpc: http://ports.ubuntu.com/
95-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
96-BaseURI-lpia: http://ports.ubuntu.com/
97-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
98-BaseURI-armel: http://ports.ubuntu.com/
99-MatchURI-armel: ports.ubuntu.com|archive.ubuntu.com
100+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
101+MatchURI: ports.ubuntu.com/ubuntu-ports
102+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
103+MatchURI-amd64: archive.ubuntu.com/ubuntu
104+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
105+MatchURI-i386: archive.ubuntu.com/ubuntu
106 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
107 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
108 _Description: Ubuntu 9.04 'Jaunty Jackalope'
109@@ -170,14 +160,12 @@
110 Suite: jaunty-security
111 ParentSuite: jaunty
112 RepositoryType: deb
113-BaseURI: http://security.ubuntu.com/ubuntu/
114-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
115-BaseURI-powerpc: http://ports.ubuntu.com/
116-MatchURI-powerpc: ports.ubuntu.com/ubuntu
117-BaseURI-lpia: http://ports.ubuntu.com/
118-MatchURI-lpia: ports.ubuntu.com/ubuntu
119-BaseURI-armel: http://ports.ubuntu.com/
120-MatchURI-armel: ports.ubuntu.com/ubuntu
121+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
122+MatchURI: ports.ubuntu.com/ubuntu-ports
123+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
124+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
125+BaseURI-i386: http://security.ubuntu.com/ubuntu/
126+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
127 _Description: Important security updates
128
129 Suite: jaunty-updates
130@@ -197,12 +185,12 @@
131
132 Suite: intrepid
133 RepositoryType: deb
134-BaseURI: http://archive.ubuntu.com/ubuntu/
135-MatchURI: archive.ubuntu.com/ubuntu
136-BaseURI-powerpc: http://ports.ubuntu.com/
137-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
138-BaseURI-lpia: http://ports.ubuntu.com/
139-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
140+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
141+MatchURI: ports.ubuntu.com/ubuntu-ports
142+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
143+MatchURI-amd64: archive.ubuntu.com/ubuntu
144+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
145+MatchURI-i386: archive.ubuntu.com/ubuntu
146 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
147 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
148 _Description: Ubuntu 8.10 'Intrepid Ibex'
149@@ -233,12 +221,12 @@
150 Suite: intrepid-security
151 ParentSuite: intrepid
152 RepositoryType: deb
153-BaseURI: http://security.ubuntu.com/ubuntu/
154-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
155-BaseURI-powerpc: http://ports.ubuntu.com/
156-MatchURI-powerpc: ports.ubuntu.com/ubuntu
157-BaseURI-lpia: http://ports.ubuntu.com/
158-MatchURI-lpia: ports.ubuntu.com/ubuntu
159+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
160+MatchURI: ports.ubuntu.com/ubuntu-ports
161+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
162+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
163+BaseURI-i386: http://security.ubuntu.com/ubuntu/
164+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
165 _Description: Important security updates
166
167 Suite: intrepid-updates
168@@ -259,12 +247,12 @@
169
170 Suite: hardy
171 RepositoryType: deb
172-BaseURI: http://archive.ubuntu.com/ubuntu/
173-MatchURI: archive.ubuntu.com/ubuntu
174-BaseURI-powerpc: http://ports.ubuntu.com/
175-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
176-BaseURI-lpia: http://ports.ubuntu.com/
177-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
178+BaseURI: http://ports.ubuntu.com/ubuntu-ports
179+MatchURI: ports.ubuntu.com/ubuntu-ports
180+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
181+MatchURI-amd64: archive.ubuntu.com/ubuntu
182+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
183+MatchURI-i386: archive.ubuntu.com/ubuntu
184 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
185 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
186 _Description: Ubuntu 8.04 'Hardy Heron'
187@@ -295,10 +283,12 @@
188 Suite: hardy-security
189 ParentSuite: hardy
190 RepositoryType: deb
191-BaseURI: http://security.ubuntu.com/ubuntu/
192-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
193-BaseURI-powerpc: http://ports.ubuntu.com/
194-MatchURI-powerpc: ports.ubuntu.com/ubuntu
195+BaseURI: http://ports.ubuntu.com/
196+MatchURI: ports.ubuntu.com/ubuntu-ports
197+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
198+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
199+BaseURI-i386: http://security.ubuntu.com/ubuntu/
200+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
201 _Description: Important security updates
202
203 Suite: hardy-updates
204@@ -319,8 +309,14 @@
205
206 Suite: gutsy
207 RepositoryType: deb
208-BaseURI: http://archive.ubuntu.com/ubuntu/
209-MatchURI: archive.ubuntu.com/ubuntu
210+BaseURI: http://ports.ubuntu.com/
211+MatchURI: ports.ubuntu.com/ubuntu-ports
212+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
213+MatchURI-amd64: archive.ubuntu.com/ubuntu
214+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
215+MatchURI-i386: archive.ubuntu.com/ubuntu
216+BaseURI-sparc: http://archive.ubuntu.com/ubuntu/
217+MatchURI-sparc: archive.ubuntu.com/ubuntu
218 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
219 _Description: Ubuntu 7.10 'Gutsy Gibbon'
220 Component: main
221@@ -350,8 +346,14 @@
222 Suite: gutsy-security
223 ParentSuite: gutsy
224 RepositoryType: deb
225-BaseURI: http://security.ubuntu.com/ubuntu/
226-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
227+BaseURI: http://ports.ubuntu.com/
228+MatchURI: ports.ubuntu.com/ubuntu-ports
229+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
230+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
231+BaseURI-i386: http://security.ubuntu.com/ubuntu/
232+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
233+BaseURI-sparc: http://security.ubuntu.com/ubuntu/
234+MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com
235 _Description: Important security updates
236
237 Suite: gutsy-updates
238@@ -374,6 +376,10 @@
239 RepositoryType: deb
240 BaseURI: http://archive.ubuntu.com/ubuntu/
241 MatchURI: archive.ubuntu.com/ubuntu
242+BaseURI-ia64: http://ports.ubuntu.com/
243+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
244+BaseURI-hppa: http://ports.ubuntu.com/
245+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
246 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
247 _Description: Ubuntu 7.04 'Feisty Fawn'
248 Component: main
249@@ -405,6 +411,10 @@
250 RepositoryType: deb
251 BaseURI: http://security.ubuntu.com/ubuntu/
252 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
253+BaseURI-ia64: http://ports.ubuntu.com/
254+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
255+BaseURI-hppa: http://ports.ubuntu.com/
256+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
257 _Description: Important security updates
258
259 Suite: feisty-updates
260@@ -426,6 +436,10 @@
261 RepositoryType: deb
262 BaseURI: http://archive.ubuntu.com/ubuntu/
263 MatchURI: archive.ubuntu.com/ubuntu
264+BaseURI-ia64: http://ports.ubuntu.com/
265+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
266+BaseURI-hppa: http://ports.ubuntu.com/
267+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
268 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
269 _Description: Ubuntu 6.10 'Edgy Eft'
270 Component: main
271@@ -457,6 +471,10 @@
272 RepositoryType: deb
273 BaseURI: http://security.ubuntu.com/ubuntu/
274 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
275+BaseURI-ia64: http://ports.ubuntu.com/
276+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
277+BaseURI-hppa: http://ports.ubuntu.com/
278+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
279 _Description: Important security updates
280
281 Suite: edgy-updates
282@@ -478,6 +496,10 @@
283 RepositoryType: deb
284 BaseURI: http://archive.ubuntu.com/ubuntu/
285 MatchURI: archive.ubuntu.com/ubuntu
286+BaseURI-ia64: http://ports.ubuntu.com/
287+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
288+BaseURI-hppa: http://ports.ubuntu.com/
289+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
290 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
291 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
292 Component: main
293@@ -509,6 +531,10 @@
294 RepositoryType: deb
295 BaseURI: http://security.ubuntu.com/ubuntu/
296 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
297+BaseURI-ia64: http://ports.ubuntu.com/
298+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
299+BaseURI-hppa: http://ports.ubuntu.com/
300+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
301 _Description: Important security updates
302
303 Suite: dapper-updates
304@@ -531,6 +557,10 @@
305 BaseURI: http://archive.ubuntu.com/ubuntu/
306 MatchURI: archive.ubuntu.com/ubuntu
307 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
308+BaseURI-ia64: http://ports.ubuntu.com/
309+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
310+BaseURI-hppa: http://ports.ubuntu.com/
311+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
312 _Description: Ubuntu 5.10 'Breezy Badger'
313 Component: main
314 _CompDescription: Officially supported
315@@ -557,6 +587,10 @@
316 RepositoryType: deb
317 BaseURI: http://security.ubuntu.com/ubuntu/
318 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
319+BaseURI-ia64: http://ports.ubuntu.com/
320+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
321+BaseURI-hppa: http://ports.ubuntu.com/
322+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
323 _Description: Ubuntu 5.10 Security Updates
324
325 Suite: breezy-updates
326@@ -573,6 +607,10 @@
327 RepositoryType: deb
328 BaseURI: http://archive.ubuntu.com/ubuntu/
329 MatchURI: archive.ubuntu.com/ubuntu
330+BaseURI-ia64: http://ports.ubuntu.com/
331+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
332+BaseURI-hppa: http://ports.ubuntu.com/
333+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
334 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
335 _Description: Ubuntu 5.04 'Hoary Hedgehog'
336 Component: main
337@@ -600,6 +638,10 @@
338 RepositoryType: deb
339 BaseURI: http://security.ubuntu.com/ubuntu/
340 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
341+BaseURI-ia64: http://ports.ubuntu.com/
342+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
343+BaseURI-hppa: http://ports.ubuntu.com/
344+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
345 _Description: Ubuntu 5.04 Security Updates
346
347 Suite: hoary-updates
348
349=== modified file 'debian/changelog'
350--- debian/changelog 2010-03-04 12:14:07 +0000
351+++ debian/changelog 2010-03-09 10:28:28 +0000
352@@ -1,9 +1,15 @@
353-python-apt (0.7.13.4ubuntu5) ludic; urgency=low
354+python-apt (0.7.13.4ubuntu5) lucid; urgency=low
355
356+ [ Michael Vogt ]
357 * data/templates/Ubuntu.info.in:
358 - make armel point to ports.ubuntu.com (LP: #531876)
359
360- -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 04 Mar 2010 13:12:39 +0100
361+ [ Emmet Hikory ]
362+ * data/templates/Ubuntu.info.in:
363+ - refactor to use ports by default for gutsy and newer releases
364+ - Set appropriate exceptions to defaults for warty-lucid
365+
366+ -- Emmet Hikory <persia@ubuntu.com> Fri, 05 Mar 2010 10:22:05 +0900
367
368 python-apt (0.7.13.4ubuntu4) lucid; urgency=low
369

Subscribers

People subscribed via source and target branches

to all changes: