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

Proposed by Emmet Hikory
Status: Merged
Merged at revision: not available
Proposed branch: lp:~persia/python-apt/jaunty+bf531876
Merge into: lp:~ubuntu-core-dev/python-apt/jaunty
Diff against target: 275 lines (+100/-38)
2 files modified
data/templates/Ubuntu.info.in (+92/-38)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~persia/python-apt/jaunty+bf531876
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+20808@code.launchpad.net
To post a comment you must log in.
308. 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 2009-01-11 18:30:07 +0000
3+++ data/templates/Ubuntu.info.in 2010-03-09 10:23:28 +0000
4@@ -2,12 +2,12 @@
5
6 Suite: jaunty
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.04 'Jaunty Jackalope'
23@@ -38,12 +38,12 @@
24 Suite: jaunty-security
25 ParentSuite: jaunty
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: jaunty-updates
42@@ -63,12 +63,12 @@
43
44 Suite: intrepid
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 8.10 'Intrepid Ibex'
61@@ -99,12 +99,12 @@
62 Suite: intrepid-security
63 ParentSuite: intrepid
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: intrepid-updates
80@@ -125,12 +125,12 @@
81
82 Suite: hardy
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.04 'Hardy Heron'
99@@ -161,10 +161,12 @@
100 Suite: hardy-security
101 ParentSuite: hardy
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: http://ports.ubuntu.com/
108+MatchURI: ports.ubuntu.com/ubuntu-ports
109+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
110+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
111+BaseURI-i386: http://security.ubuntu.com/ubuntu/
112+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
113 _Description: Important security updates
114
115 Suite: hardy-updates
116@@ -185,8 +187,14 @@
117
118 Suite: gutsy
119 RepositoryType: deb
120-BaseURI: http://archive.ubuntu.com/ubuntu/
121-MatchURI: archive.ubuntu.com/ubuntu
122+BaseURI: http://ports.ubuntu.com/
123+MatchURI: ports.ubuntu.com/ubuntu-ports
124+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
125+MatchURI-amd64: archive.ubuntu.com/ubuntu
126+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
127+MatchURI-i386: archive.ubuntu.com/ubuntu
128+BaseURI-sparc: http://archive.ubuntu.com/ubuntu/
129+MatchURI-sparc: archive.ubuntu.com/ubuntu
130 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
131 _Description: Ubuntu 7.10 'Gutsy Gibbon'
132 Component: main
133@@ -216,8 +224,14 @@
134 Suite: gutsy-security
135 ParentSuite: gutsy
136 RepositoryType: deb
137-BaseURI: http://security.ubuntu.com/ubuntu/
138-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
139+BaseURI: http://ports.ubuntu.com/
140+MatchURI: ports.ubuntu.com/ubuntu-ports
141+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
142+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
143+BaseURI-i386: http://security.ubuntu.com/ubuntu/
144+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
145+BaseURI-sparc: http://security.ubuntu.com/ubuntu/
146+MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com
147 _Description: Important security updates
148
149 Suite: gutsy-updates
150@@ -240,6 +254,10 @@
151 RepositoryType: deb
152 BaseURI: http://archive.ubuntu.com/ubuntu/
153 MatchURI: archive.ubuntu.com/ubuntu
154+BaseURI-ia64: http://ports.ubuntu.com/
155+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
156+BaseURI-hppa: http://ports.ubuntu.com/
157+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
158 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
159 _Description: Ubuntu 7.04 'Feisty Fawn'
160 Component: main
161@@ -271,6 +289,10 @@
162 RepositoryType: deb
163 BaseURI: http://security.ubuntu.com/ubuntu/
164 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
165+BaseURI-ia64: http://ports.ubuntu.com/
166+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
167+BaseURI-hppa: http://ports.ubuntu.com/
168+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
169 _Description: Important security updates
170
171 Suite: feisty-updates
172@@ -292,6 +314,10 @@
173 RepositoryType: deb
174 BaseURI: http://archive.ubuntu.com/ubuntu/
175 MatchURI: archive.ubuntu.com/ubuntu
176+BaseURI-ia64: http://ports.ubuntu.com/
177+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
178+BaseURI-hppa: http://ports.ubuntu.com/
179+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
180 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
181 _Description: Ubuntu 6.10 'Edgy Eft'
182 Component: main
183@@ -323,6 +349,10 @@
184 RepositoryType: deb
185 BaseURI: http://security.ubuntu.com/ubuntu/
186 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
187+BaseURI-ia64: http://ports.ubuntu.com/
188+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
189+BaseURI-hppa: http://ports.ubuntu.com/
190+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
191 _Description: Important security updates
192
193 Suite: edgy-updates
194@@ -344,6 +374,10 @@
195 RepositoryType: deb
196 BaseURI: http://archive.ubuntu.com/ubuntu/
197 MatchURI: archive.ubuntu.com/ubuntu
198+BaseURI-ia64: http://ports.ubuntu.com/
199+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
200+BaseURI-hppa: http://ports.ubuntu.com/
201+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
202 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
203 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
204 Component: main
205@@ -375,6 +409,10 @@
206 RepositoryType: deb
207 BaseURI: http://security.ubuntu.com/ubuntu/
208 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
209+BaseURI-ia64: http://ports.ubuntu.com/
210+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
211+BaseURI-hppa: http://ports.ubuntu.com/
212+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
213 _Description: Important security updates
214
215 Suite: dapper-updates
216@@ -397,6 +435,10 @@
217 BaseURI: http://archive.ubuntu.com/ubuntu/
218 MatchURI: archive.ubuntu.com/ubuntu
219 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
220+BaseURI-ia64: http://ports.ubuntu.com/
221+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
222+BaseURI-hppa: http://ports.ubuntu.com/
223+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
224 _Description: Ubuntu 5.10 'Breezy Badger'
225 Component: main
226 _CompDescription: Officially supported
227@@ -423,6 +465,10 @@
228 RepositoryType: deb
229 BaseURI: http://security.ubuntu.com/ubuntu/
230 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
231+BaseURI-ia64: http://ports.ubuntu.com/
232+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
233+BaseURI-hppa: http://ports.ubuntu.com/
234+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
235 _Description: Ubuntu 5.10 Security Updates
236
237 Suite: breezy-updates
238@@ -439,6 +485,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 5.04 'Hoary Hedgehog'
248 Component: main
249@@ -466,6 +516,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: Ubuntu 5.04 Security Updates
258
259 Suite: hoary-updates
260
261=== modified file 'debian/changelog'
262--- debian/changelog 2009-03-30 15:25:52 +0000
263+++ debian/changelog 2010-03-09 10:23:28 +0000
264@@ -1,3 +1,11 @@
265+python-apt (0.7.9~exp2ubuntu10.1) jaunty-proposed; urgency=low
266+
267+ * data/templates/Ubuntu.info.in: (LP: #531876)
268+ - refactor to use ports by default for gutsy and newer releases
269+ - Set appropriate exceptions to defaults for warty-jaunty
270+
271+ -- Emmet Hikory <persia@ubuntu.com> Sat, 06 Mar 2010 07:19:26 +0900
272+
273 python-apt (0.7.9~exp2ubuntu10) jaunty; urgency=low
274
275 * .bzr-buildpackage/default.conf:

Subscribers

People subscribed via source and target branches

to all changes: