the python apt bindings

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

  1. karmic+bf531876
  2. Merge into karmic
Proposed by Emmet Hikory
Status: Merged
Merged at revision: not available
Proposed branch: lp:~persia/python-apt/karmic+bf531876
Merge into: lp:~ubuntu-core-dev/python-apt/karmic
Diff against target: 313 lines (+112/-50)
2 files modified
data/templates/Ubuntu.info.in (+104/-50)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~persia/python-apt/karmic+bf531876
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+20807@code.launchpad.net
To post a comment you must log in.
lp:~persia/python-apt/karmic+bf531876 updated
332. 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 2009-05-06 19:19:53 +0000
3+++ data/templates/Ubuntu.info.in 2010-03-09 10:24:31 +0000
4@@ -2,12 +2,12 @@
5
6 Suite: karmic
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: http://ports.ubuntu.com/ubuntu-ports/
15+MatchURI: ports.ubuntu.com/ubuntu-ports
16+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
17+MatchURI-amd64: archive.ubuntu.com/ubuntu
18+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
19+MatchURI-i386: archive.ubuntu.com/ubuntu
20 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
21 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
22 _Description: Ubuntu 9.10 'Karmic Koala'
23@@ -38,12 +38,12 @@
24 Suite: karmic-security
25 ParentSuite: karmic
26 RepositoryType: deb
27-BaseURI: http://security.ubuntu.com/ubuntu/
28-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
29-BaseURI-powerpc: http://ports.ubuntu.com/
30-MatchURI-powerpc: ports.ubuntu.com/ubuntu
31-BaseURI-lpia: http://ports.ubuntu.com/
32-MatchURI-lpia: ports.ubuntu.com/ubuntu
33+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
34+MatchURI: ports.ubuntu.com/ubuntu-ports
35+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
36+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
37+BaseURI-i386: http://security.ubuntu.com/ubuntu/
38+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
39 _Description: Important security updates
40
41 Suite: karmic-updates
42@@ -63,12 +63,12 @@
43
44 Suite: jaunty
45 RepositoryType: deb
46-BaseURI: http://archive.ubuntu.com/ubuntu/
47-MatchURI: archive.ubuntu.com/ubuntu
48-BaseURI-powerpc: http://ports.ubuntu.com/
49-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
50-BaseURI-lpia: http://ports.ubuntu.com/
51-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
52+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
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 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
59 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
60 _Description: Ubuntu 9.04 'Jaunty Jackalope'
61@@ -99,12 +99,12 @@
62 Suite: jaunty-security
63 ParentSuite: jaunty
64 RepositoryType: deb
65-BaseURI: http://security.ubuntu.com/ubuntu/
66-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
67-BaseURI-powerpc: http://ports.ubuntu.com/
68-MatchURI-powerpc: ports.ubuntu.com/ubuntu
69-BaseURI-lpia: http://ports.ubuntu.com/
70-MatchURI-lpia: ports.ubuntu.com/ubuntu
71+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
72+MatchURI: ports.ubuntu.com/ubuntu-ports
73+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
74+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
75+BaseURI-i386: http://security.ubuntu.com/ubuntu/
76+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
77 _Description: Important security updates
78
79 Suite: jaunty-updates
80@@ -124,12 +124,12 @@
81
82 Suite: intrepid
83 RepositoryType: deb
84-BaseURI: http://archive.ubuntu.com/ubuntu/
85-MatchURI: archive.ubuntu.com/ubuntu
86-BaseURI-powerpc: http://ports.ubuntu.com/
87-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
88-BaseURI-lpia: http://ports.ubuntu.com/
89-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
90+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
91+MatchURI: ports.ubuntu.com/ubuntu-ports
92+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
93+MatchURI-amd64: archive.ubuntu.com/ubuntu
94+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
95+MatchURI-i386: archive.ubuntu.com/ubuntu
96 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
97 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
98 _Description: Ubuntu 8.10 'Intrepid Ibex'
99@@ -160,12 +160,12 @@
100 Suite: intrepid-security
101 ParentSuite: intrepid
102 RepositoryType: deb
103-BaseURI: http://security.ubuntu.com/ubuntu/
104-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
105-BaseURI-powerpc: http://ports.ubuntu.com/
106-MatchURI-powerpc: ports.ubuntu.com/ubuntu
107-BaseURI-lpia: http://ports.ubuntu.com/
108-MatchURI-lpia: ports.ubuntu.com/ubuntu
109+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
110+MatchURI: ports.ubuntu.com/ubuntu-ports
111+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
112+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
113+BaseURI-i386: http://security.ubuntu.com/ubuntu/
114+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
115 _Description: Important security updates
116
117 Suite: intrepid-updates
118@@ -186,12 +186,12 @@
119
120 Suite: hardy
121 RepositoryType: deb
122-BaseURI: http://archive.ubuntu.com/ubuntu/
123-MatchURI: archive.ubuntu.com/ubuntu
124-BaseURI-powerpc: http://ports.ubuntu.com/
125-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
126-BaseURI-lpia: http://ports.ubuntu.com/
127-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
128+BaseURI: http://ports.ubuntu.com/ubuntu-ports
129+MatchURI: ports.ubuntu.com/ubuntu-ports
130+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
131+MatchURI-amd64: archive.ubuntu.com/ubuntu
132+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
133+MatchURI-i386: archive.ubuntu.com/ubuntu
134 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
135 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
136 _Description: Ubuntu 8.04 'Hardy Heron'
137@@ -222,10 +222,12 @@
138 Suite: hardy-security
139 ParentSuite: hardy
140 RepositoryType: deb
141-BaseURI: http://security.ubuntu.com/ubuntu/
142-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
143-BaseURI-powerpc: http://ports.ubuntu.com/
144-MatchURI-powerpc: ports.ubuntu.com/ubuntu
145+BaseURI: http://ports.ubuntu.com/
146+MatchURI: ports.ubuntu.com/ubuntu-ports
147+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
148+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
149+BaseURI-i386: http://security.ubuntu.com/ubuntu/
150+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
151 _Description: Important security updates
152
153 Suite: hardy-updates
154@@ -246,8 +248,14 @@
155
156 Suite: gutsy
157 RepositoryType: deb
158-BaseURI: http://archive.ubuntu.com/ubuntu/
159-MatchURI: archive.ubuntu.com/ubuntu
160+BaseURI: http://ports.ubuntu.com/
161+MatchURI: ports.ubuntu.com/ubuntu-ports
162+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
163+MatchURI-amd64: archive.ubuntu.com/ubuntu
164+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
165+MatchURI-i386: archive.ubuntu.com/ubuntu
166+BaseURI-sparc: http://archive.ubuntu.com/ubuntu/
167+MatchURI-sparc: archive.ubuntu.com/ubuntu
168 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
169 _Description: Ubuntu 7.10 'Gutsy Gibbon'
170 Component: main
171@@ -277,8 +285,14 @@
172 Suite: gutsy-security
173 ParentSuite: gutsy
174 RepositoryType: deb
175-BaseURI: http://security.ubuntu.com/ubuntu/
176-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
177+BaseURI: http://ports.ubuntu.com/
178+MatchURI: ports.ubuntu.com/ubuntu-ports
179+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
180+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
181+BaseURI-i386: http://security.ubuntu.com/ubuntu/
182+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
183+BaseURI-sparc: http://security.ubuntu.com/ubuntu/
184+MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com
185 _Description: Important security updates
186
187 Suite: gutsy-updates
188@@ -301,6 +315,10 @@
189 RepositoryType: deb
190 BaseURI: http://archive.ubuntu.com/ubuntu/
191 MatchURI: archive.ubuntu.com/ubuntu
192+BaseURI-ia64: http://ports.ubuntu.com/
193+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
194+BaseURI-hppa: http://ports.ubuntu.com/
195+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
196 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
197 _Description: Ubuntu 7.04 'Feisty Fawn'
198 Component: main
199@@ -332,6 +350,10 @@
200 RepositoryType: deb
201 BaseURI: http://security.ubuntu.com/ubuntu/
202 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
203+BaseURI-ia64: http://ports.ubuntu.com/
204+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
205+BaseURI-hppa: http://ports.ubuntu.com/
206+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
207 _Description: Important security updates
208
209 Suite: feisty-updates
210@@ -353,6 +375,10 @@
211 RepositoryType: deb
212 BaseURI: http://archive.ubuntu.com/ubuntu/
213 MatchURI: archive.ubuntu.com/ubuntu
214+BaseURI-ia64: http://ports.ubuntu.com/
215+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
216+BaseURI-hppa: http://ports.ubuntu.com/
217+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
218 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
219 _Description: Ubuntu 6.10 'Edgy Eft'
220 Component: main
221@@ -384,6 +410,10 @@
222 RepositoryType: deb
223 BaseURI: http://security.ubuntu.com/ubuntu/
224 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
225+BaseURI-ia64: http://ports.ubuntu.com/
226+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
227+BaseURI-hppa: http://ports.ubuntu.com/
228+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
229 _Description: Important security updates
230
231 Suite: edgy-updates
232@@ -405,6 +435,10 @@
233 RepositoryType: deb
234 BaseURI: http://archive.ubuntu.com/ubuntu/
235 MatchURI: archive.ubuntu.com/ubuntu
236+BaseURI-ia64: http://ports.ubuntu.com/
237+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
238+BaseURI-hppa: http://ports.ubuntu.com/
239+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
240 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
241 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
242 Component: main
243@@ -436,6 +470,10 @@
244 RepositoryType: deb
245 BaseURI: http://security.ubuntu.com/ubuntu/
246 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
247+BaseURI-ia64: http://ports.ubuntu.com/
248+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
249+BaseURI-hppa: http://ports.ubuntu.com/
250+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
251 _Description: Important security updates
252
253 Suite: dapper-updates
254@@ -458,6 +496,10 @@
255 BaseURI: http://archive.ubuntu.com/ubuntu/
256 MatchURI: archive.ubuntu.com/ubuntu
257 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
258+BaseURI-ia64: http://ports.ubuntu.com/
259+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
260+BaseURI-hppa: http://ports.ubuntu.com/
261+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
262 _Description: Ubuntu 5.10 'Breezy Badger'
263 Component: main
264 _CompDescription: Officially supported
265@@ -484,6 +526,10 @@
266 RepositoryType: deb
267 BaseURI: http://security.ubuntu.com/ubuntu/
268 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
269+BaseURI-ia64: http://ports.ubuntu.com/
270+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
271+BaseURI-hppa: http://ports.ubuntu.com/
272+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
273 _Description: Ubuntu 5.10 Security Updates
274
275 Suite: breezy-updates
276@@ -500,6 +546,10 @@
277 RepositoryType: deb
278 BaseURI: http://archive.ubuntu.com/ubuntu/
279 MatchURI: archive.ubuntu.com/ubuntu
280+BaseURI-ia64: http://ports.ubuntu.com/
281+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
282+BaseURI-hppa: http://ports.ubuntu.com/
283+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
284 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
285 _Description: Ubuntu 5.04 'Hoary Hedgehog'
286 Component: main
287@@ -527,6 +577,10 @@
288 RepositoryType: deb
289 BaseURI: http://security.ubuntu.com/ubuntu/
290 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
291+BaseURI-ia64: http://ports.ubuntu.com/
292+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
293+BaseURI-hppa: http://ports.ubuntu.com/
294+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
295 _Description: Ubuntu 5.04 Security Updates
296
297 Suite: hoary-updates
298
299=== modified file 'debian/changelog'
300--- debian/changelog 2010-03-04 15:30:31 +0000
301+++ debian/changelog 2010-03-09 10:24:31 +0000
302@@ -1,3 +1,11 @@
303+python-apt (0.7.13.2ubuntu4.1) karmic-proposed; urgency=low
304+
305+ * data/templates/Ubuntu.info.in: (LP: #531876)
306+ - refactor to use ports by default for gutsy and newer releases
307+ - Set appropriate exceptions to defaults for warty-karmic
308+
309+ -- Emmet Hikory <persia@ubuntu.com> Sat, 06 Mar 2010 07:12:17 +0900
310+
311 python-apt (0.7.13.2ubuntu4) karmic; urgency=low
312
313 * No change rebuild to fix misbuilt binaries on armel.

Subscribers

People subscribed via source and target branches

to all changes: