Merge lp:~persia/python-apt/hardy+bf531876 into lp:~ubuntu-core-dev/python-apt/hardy
- hardy+bf531876
- Merge into 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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Vogt (community) | Approve | ||
Review via email: mp+20810@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
- 272. By Emmet Hikory
-
Update based on guidance from cjwatson
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 | 2 | 2 | ||
6 | 3 | Suite: hardy | 3 | Suite: hardy |
7 | 4 | RepositoryType: deb | 4 | RepositoryType: deb |
12 | 5 | BaseURI: http://archive.ubuntu.com/ubuntu/ | 5 | BaseURI: http://ports.ubuntu.com/ubuntu-ports |
13 | 6 | MatchURI: archive.ubuntu.com/ubuntu | 6 | MatchURI: ports.ubuntu.com/ubuntu-ports |
14 | 7 | BaseURI-powerpc: http://ports.ubuntu.com/ | 7 | BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ |
15 | 8 | MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com | 8 | MatchURI-amd64: archive.ubuntu.com/ubuntu |
16 | 9 | BaseURI-i386: http://archive.ubuntu.com/ubuntu/ | ||
17 | 10 | MatchURI-i386: archive.ubuntu.com/ubuntu | ||
18 | 9 | MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors | 11 | MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors |
19 | 10 | MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors | 12 | MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors |
20 | 11 | _Description: Ubuntu 8.04 'Hardy Heron' | 13 | _Description: Ubuntu 8.04 'Hardy Heron' |
21 | @@ -25,6 +27,7 @@ | |||
22 | 25 | Suite: hardy | 27 | Suite: hardy |
23 | 26 | MatchName: .* | 28 | MatchName: .* |
24 | 27 | BaseURI: cdrom:\[Ubuntu.*8.04 | 29 | BaseURI: cdrom:\[Ubuntu.*8.04 |
25 | 30 | MatchURI: cdrom:\[Ubuntu.*8.04 | ||
26 | 28 | _Description: Cdrom with Ubuntu 8.04 'Hardy Heron' | 31 | _Description: Cdrom with Ubuntu 8.04 'Hardy Heron' |
27 | 29 | Available: False | 32 | Available: False |
28 | 30 | Component: main | 33 | Component: main |
29 | @@ -35,10 +38,12 @@ | |||
30 | 35 | Suite: hardy-security | 38 | Suite: hardy-security |
31 | 36 | ParentSuite: hardy | 39 | ParentSuite: hardy |
32 | 37 | RepositoryType: deb | 40 | RepositoryType: deb |
37 | 38 | BaseURI: http://security.ubuntu.com/ubuntu/ | 41 | BaseURI: http://ports.ubuntu.com/ |
38 | 39 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com | 42 | MatchURI: ports.ubuntu.com/ubuntu-ports |
39 | 40 | BaseURI-powerpc: http://ports.ubuntu.com/ | 43 | BaseURI-amd64: http://security.ubuntu.com/ubuntu/ |
40 | 41 | MatchURI-powerpc: ports.ubuntu.com/ubuntu | 44 | MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com |
41 | 45 | BaseURI-i386: http://security.ubuntu.com/ubuntu/ | ||
42 | 46 | MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com | ||
43 | 42 | _Description: Important security updates | 47 | _Description: Important security updates |
44 | 43 | 48 | ||
45 | 44 | Suite: hardy-updates | 49 | Suite: hardy-updates |
46 | @@ -59,8 +64,14 @@ | |||
47 | 59 | 64 | ||
48 | 60 | Suite: gutsy | 65 | Suite: gutsy |
49 | 61 | RepositoryType: deb | 66 | RepositoryType: deb |
52 | 62 | BaseURI: http://archive.ubuntu.com/ubuntu/ | 67 | BaseURI: http://ports.ubuntu.com/ |
53 | 63 | MatchURI: archive.ubuntu.com/ubuntu | 68 | MatchURI: ports.ubuntu.com/ubuntu-ports |
54 | 69 | BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ | ||
55 | 70 | MatchURI-amd64: archive.ubuntu.com/ubuntu | ||
56 | 71 | BaseURI-i386: http://archive.ubuntu.com/ubuntu/ | ||
57 | 72 | MatchURI-i386: archive.ubuntu.com/ubuntu | ||
58 | 73 | BaseURI-sparc: http://archive.ubuntu.com/ubuntu/ | ||
59 | 74 | MatchURI-sparc: archive.ubuntu.com/ubuntu | ||
60 | 64 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors | 75 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors |
61 | 65 | _Description: Ubuntu 7.10 'Gutsy Gibbon' | 76 | _Description: Ubuntu 7.10 'Gutsy Gibbon' |
62 | 66 | Component: main | 77 | Component: main |
63 | @@ -79,6 +90,7 @@ | |||
64 | 79 | Suite: gutsy | 90 | Suite: gutsy |
65 | 80 | MatchName: .* | 91 | MatchName: .* |
66 | 81 | BaseURI: cdrom:\[Ubuntu.*7.10 | 92 | BaseURI: cdrom:\[Ubuntu.*7.10 |
67 | 93 | MatchURI: cdrom:\[Ubuntu.*7.10 | ||
68 | 82 | _Description: Cdrom with Ubuntu 7.10 'Gutsy Gibbon' | 94 | _Description: Cdrom with Ubuntu 7.10 'Gutsy Gibbon' |
69 | 83 | Available: False | 95 | Available: False |
70 | 84 | Component: main | 96 | Component: main |
71 | @@ -89,8 +101,14 @@ | |||
72 | 89 | Suite: gutsy-security | 101 | Suite: gutsy-security |
73 | 90 | ParentSuite: gutsy | 102 | ParentSuite: gutsy |
74 | 91 | RepositoryType: deb | 103 | RepositoryType: deb |
77 | 92 | BaseURI: http://security.ubuntu.com/ubuntu/ | 104 | BaseURI: http://ports.ubuntu.com/ |
78 | 93 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com | 105 | MatchURI: ports.ubuntu.com/ubuntu-ports |
79 | 106 | BaseURI-amd64: http://security.ubuntu.com/ubuntu/ | ||
80 | 107 | MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com | ||
81 | 108 | BaseURI-i386: http://security.ubuntu.com/ubuntu/ | ||
82 | 109 | MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com | ||
83 | 110 | BaseURI-sparc: http://security.ubuntu.com/ubuntu/ | ||
84 | 111 | MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com | ||
85 | 94 | _Description: Important security updates | 112 | _Description: Important security updates |
86 | 95 | 113 | ||
87 | 96 | Suite: gutsy-updates | 114 | Suite: gutsy-updates |
88 | @@ -113,6 +131,10 @@ | |||
89 | 113 | RepositoryType: deb | 131 | RepositoryType: deb |
90 | 114 | BaseURI: http://archive.ubuntu.com/ubuntu/ | 132 | BaseURI: http://archive.ubuntu.com/ubuntu/ |
91 | 115 | MatchURI: archive.ubuntu.com/ubuntu | 133 | MatchURI: archive.ubuntu.com/ubuntu |
92 | 134 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
93 | 135 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
94 | 136 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
95 | 137 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
96 | 116 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors | 138 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors |
97 | 117 | _Description: Ubuntu 7.04 'Feisty Fawn' | 139 | _Description: Ubuntu 7.04 'Feisty Fawn' |
98 | 118 | Component: main | 140 | Component: main |
99 | @@ -131,6 +153,7 @@ | |||
100 | 131 | Suite: feisty | 153 | Suite: feisty |
101 | 132 | MatchName: .* | 154 | MatchName: .* |
102 | 133 | BaseURI: cdrom:\[Ubuntu.*7.04 | 155 | BaseURI: cdrom:\[Ubuntu.*7.04 |
103 | 156 | MatchURI: cdrom:\[Ubuntu.*7.04 | ||
104 | 134 | _Description: Cdrom with Ubuntu 7.04 'Feisty Fawn' | 157 | _Description: Cdrom with Ubuntu 7.04 'Feisty Fawn' |
105 | 135 | Available: False | 158 | Available: False |
106 | 136 | Component: main | 159 | Component: main |
107 | @@ -143,6 +166,10 @@ | |||
108 | 143 | RepositoryType: deb | 166 | RepositoryType: deb |
109 | 144 | BaseURI: http://security.ubuntu.com/ubuntu/ | 167 | BaseURI: http://security.ubuntu.com/ubuntu/ |
110 | 145 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com | 168 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com |
111 | 169 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
112 | 170 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
113 | 171 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
114 | 172 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
115 | 146 | _Description: Important security updates | 173 | _Description: Important security updates |
116 | 147 | 174 | ||
117 | 148 | Suite: feisty-updates | 175 | Suite: feisty-updates |
118 | @@ -164,6 +191,10 @@ | |||
119 | 164 | RepositoryType: deb | 191 | RepositoryType: deb |
120 | 165 | BaseURI: http://archive.ubuntu.com/ubuntu/ | 192 | BaseURI: http://archive.ubuntu.com/ubuntu/ |
121 | 166 | MatchURI: archive.ubuntu.com/ubuntu | 193 | MatchURI: archive.ubuntu.com/ubuntu |
122 | 194 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
123 | 195 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
124 | 196 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
125 | 197 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
126 | 167 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors | 198 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors |
127 | 168 | _Description: Ubuntu 6.10 'Edgy Eft' | 199 | _Description: Ubuntu 6.10 'Edgy Eft' |
128 | 169 | Component: main | 200 | Component: main |
129 | @@ -182,6 +213,7 @@ | |||
130 | 182 | Suite: edgy | 213 | Suite: edgy |
131 | 183 | MatchName: .* | 214 | MatchName: .* |
132 | 184 | BaseURI: cdrom:\[Ubuntu.*6.10 | 215 | BaseURI: cdrom:\[Ubuntu.*6.10 |
133 | 216 | MatchURI: cdrom:\[Ubuntu.*6.10 | ||
134 | 185 | _Description: Cdrom with Ubuntu 6.10 'Edgy Eft' | 217 | _Description: Cdrom with Ubuntu 6.10 'Edgy Eft' |
135 | 186 | Available: False | 218 | Available: False |
136 | 187 | Component: main | 219 | Component: main |
137 | @@ -194,6 +226,10 @@ | |||
138 | 194 | RepositoryType: deb | 226 | RepositoryType: deb |
139 | 195 | BaseURI: http://security.ubuntu.com/ubuntu/ | 227 | BaseURI: http://security.ubuntu.com/ubuntu/ |
140 | 196 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com | 228 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com |
141 | 229 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
142 | 230 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
143 | 231 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
144 | 232 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
145 | 197 | _Description: Important security updates | 233 | _Description: Important security updates |
146 | 198 | 234 | ||
147 | 199 | Suite: edgy-updates | 235 | Suite: edgy-updates |
148 | @@ -215,6 +251,10 @@ | |||
149 | 215 | RepositoryType: deb | 251 | RepositoryType: deb |
150 | 216 | BaseURI: http://archive.ubuntu.com/ubuntu/ | 252 | BaseURI: http://archive.ubuntu.com/ubuntu/ |
151 | 217 | MatchURI: archive.ubuntu.com/ubuntu | 253 | MatchURI: archive.ubuntu.com/ubuntu |
152 | 254 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
153 | 255 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
154 | 256 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
155 | 257 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
156 | 218 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors | 258 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors |
157 | 219 | _Description: Ubuntu 6.06 LTS 'Dapper Drake' | 259 | _Description: Ubuntu 6.06 LTS 'Dapper Drake' |
158 | 220 | Component: main | 260 | Component: main |
159 | @@ -225,7 +265,7 @@ | |||
160 | 225 | _CompDescriptionLong: Community-maintained Open Source software | 265 | _CompDescriptionLong: Community-maintained Open Source software |
161 | 226 | Component: restricted | 266 | Component: restricted |
162 | 227 | _CompDescription: Non-free drivers | 267 | _CompDescription: Non-free drivers |
164 | 228 | _CompDescriptionLong: Proprietary drivers for devices | 268 | _CompDescriptionLong: Proprietary drivers for devices |
165 | 229 | Component: multiverse | 269 | Component: multiverse |
166 | 230 | _CompDescription: Restricted software (Multiverse) | 270 | _CompDescription: Restricted software (Multiverse) |
167 | 231 | _CompDescriptionLong: Software restricted by copyright or legal issues | 271 | _CompDescriptionLong: Software restricted by copyright or legal issues |
168 | @@ -233,6 +273,7 @@ | |||
169 | 233 | Suite: dapper | 273 | Suite: dapper |
170 | 234 | MatchName: .* | 274 | MatchName: .* |
171 | 235 | BaseURI: cdrom:\[Ubuntu.*6.06 | 275 | BaseURI: cdrom:\[Ubuntu.*6.06 |
172 | 276 | MatchURI: cdrom:\[Ubuntu.*6.06 | ||
173 | 236 | _Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' | 277 | _Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' |
174 | 237 | Available: False | 278 | Available: False |
175 | 238 | Component: main | 279 | Component: main |
176 | @@ -245,6 +286,10 @@ | |||
177 | 245 | RepositoryType: deb | 286 | RepositoryType: deb |
178 | 246 | BaseURI: http://security.ubuntu.com/ubuntu/ | 287 | BaseURI: http://security.ubuntu.com/ubuntu/ |
179 | 247 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com | 288 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com |
180 | 289 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
181 | 290 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
182 | 291 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
183 | 292 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
184 | 248 | _Description: Important security updates | 293 | _Description: Important security updates |
185 | 249 | 294 | ||
186 | 250 | Suite: dapper-updates | 295 | Suite: dapper-updates |
187 | @@ -267,6 +312,10 @@ | |||
188 | 267 | BaseURI: http://archive.ubuntu.com/ubuntu/ | 312 | BaseURI: http://archive.ubuntu.com/ubuntu/ |
189 | 268 | MatchURI: archive.ubuntu.com/ubuntu | 313 | MatchURI: archive.ubuntu.com/ubuntu |
190 | 269 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors | 314 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors |
191 | 315 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
192 | 316 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
193 | 317 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
194 | 318 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
195 | 270 | _Description: Ubuntu 5.10 'Breezy Badger' | 319 | _Description: Ubuntu 5.10 'Breezy Badger' |
196 | 271 | Component: main | 320 | Component: main |
197 | 272 | _CompDescription: Officially supported | 321 | _CompDescription: Officially supported |
198 | @@ -280,6 +329,7 @@ | |||
199 | 280 | Suite: breezy | 329 | Suite: breezy |
200 | 281 | MatchName: .* | 330 | MatchName: .* |
201 | 282 | BaseURI: cdrom:\[Ubuntu.*5.10 | 331 | BaseURI: cdrom:\[Ubuntu.*5.10 |
202 | 332 | MatchURI: cdrom:\[Ubuntu.*5.10 | ||
203 | 283 | _Description: Cdrom with Ubuntu 5.10 'Breezy Badger' | 333 | _Description: Cdrom with Ubuntu 5.10 'Breezy Badger' |
204 | 284 | Available: False | 334 | Available: False |
205 | 285 | Component: main | 335 | Component: main |
206 | @@ -292,6 +342,10 @@ | |||
207 | 292 | RepositoryType: deb | 342 | RepositoryType: deb |
208 | 293 | BaseURI: http://security.ubuntu.com/ubuntu/ | 343 | BaseURI: http://security.ubuntu.com/ubuntu/ |
209 | 294 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com | 344 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com |
210 | 345 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
211 | 346 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
212 | 347 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
213 | 348 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
214 | 295 | _Description: Ubuntu 5.10 Security Updates | 349 | _Description: Ubuntu 5.10 Security Updates |
215 | 296 | 350 | ||
216 | 297 | Suite: breezy-updates | 351 | Suite: breezy-updates |
217 | @@ -308,6 +362,10 @@ | |||
218 | 308 | RepositoryType: deb | 362 | RepositoryType: deb |
219 | 309 | BaseURI: http://archive.ubuntu.com/ubuntu/ | 363 | BaseURI: http://archive.ubuntu.com/ubuntu/ |
220 | 310 | MatchURI: archive.ubuntu.com/ubuntu | 364 | MatchURI: archive.ubuntu.com/ubuntu |
221 | 365 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
222 | 366 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
223 | 367 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
224 | 368 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
225 | 311 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors | 369 | MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors |
226 | 312 | _Description: Ubuntu 5.04 'Hoary Hedgehog' | 370 | _Description: Ubuntu 5.04 'Hoary Hedgehog' |
227 | 313 | Component: main | 371 | Component: main |
228 | @@ -322,6 +380,7 @@ | |||
229 | 322 | Suite: hoary | 380 | Suite: hoary |
230 | 323 | MatchName: .* | 381 | MatchName: .* |
231 | 324 | BaseURI: cdrom:\[Ubuntu.*5.04 | 382 | BaseURI: cdrom:\[Ubuntu.*5.04 |
232 | 383 | MatchURI: cdrom:\[Ubuntu.*5.04 | ||
233 | 325 | _Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' | 384 | _Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' |
234 | 326 | Available: False | 385 | Available: False |
235 | 327 | Component: main | 386 | Component: main |
236 | @@ -334,6 +393,10 @@ | |||
237 | 334 | RepositoryType: deb | 393 | RepositoryType: deb |
238 | 335 | BaseURI: http://security.ubuntu.com/ubuntu/ | 394 | BaseURI: http://security.ubuntu.com/ubuntu/ |
239 | 336 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com | 395 | MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com |
240 | 396 | BaseURI-ia64: http://ports.ubuntu.com/ | ||
241 | 397 | MatchURI-ia64: ports.ubuntu.com/ubuntu-ports | ||
242 | 398 | BaseURI-hppa: http://ports.ubuntu.com/ | ||
243 | 399 | MatchURI-hppa: ports.ubuntu.com/ubuntu-ports | ||
244 | 337 | _Description: Ubuntu 5.04 Security Updates | 400 | _Description: Ubuntu 5.04 Security Updates |
245 | 338 | 401 | ||
246 | 339 | Suite: hoary-updates | 402 | Suite: hoary-updates |
247 | @@ -363,6 +426,7 @@ | |||
248 | 363 | Suite: warty | 426 | Suite: warty |
249 | 364 | MatchName: .* | 427 | MatchName: .* |
250 | 365 | BaseURI: cdrom:\[Ubuntu.*4.10 | 428 | BaseURI: cdrom:\[Ubuntu.*4.10 |
251 | 429 | MatchURI: cdrom:\[Ubuntu.*4.10 | ||
252 | 366 | _Description: Cdrom with Ubuntu 4.10 'Warty Warthog' | 430 | _Description: Cdrom with Ubuntu 4.10 'Warty Warthog' |
253 | 367 | Available: False | 431 | Available: False |
254 | 368 | Component: main | 432 | Component: main |
255 | 369 | 433 | ||
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 | 1 | python-apt (0.7.4ubuntu7.6) hardy-proposed; urgency=low | ||
261 | 2 | |||
262 | 3 | * data/templates/Ubuntu.info.in: (LP: #531876) | ||
263 | 4 | - refactor to use ports by default for gutsy and newer releases | ||
264 | 5 | - Set appropriate exceptions to defaults for warty-hardy | ||
265 | 6 | |||
266 | 7 | -- Emmet Hikory <persia@ubuntu.com> Sat, 06 Mar 2010 07:42:31 +0900 | ||
267 | 8 | |||
268 | 1 | python-apt (0.7.4ubuntu7.5) hardy-proposed; urgency=low | 9 | python-apt (0.7.4ubuntu7.5) hardy-proposed; urgency=low |
269 | 2 | 10 | ||
270 | 3 | * aptsources/__init__.py, aptsources/distinfo.py: | 11 | * aptsources/__init__.py, aptsources/distinfo.py: |
Merged, thanks