the python apt bindings

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

  1. intrepid+bf531876
  2. Merge into intrepid
Proposed by Emmet Hikory
Status: Merged
Merged at revision: not available
Proposed branch: lp:~persia/python-apt/intrepid+bf531876
Merge into: lp:~ubuntu-core-dev/python-apt/intrepid
Diff against target: 238 lines (+89/-19)
2 files modified
data/templates/Ubuntu.info.in (+81/-19)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~persia/python-apt/intrepid+bf531876
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+20809@code.launchpad.net
To post a comment you must log in.
lp:~persia/python-apt/intrepid+bf531876 updated
283. 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
=== modified file 'data/templates/Ubuntu.info.in'
--- data/templates/Ubuntu.info.in 2008-09-18 12:35:14 +0000
+++ data/templates/Ubuntu.info.in 2010-03-09 10:22:27 +0000
@@ -2,10 +2,12 @@
22
3Suite: intrepid3Suite: intrepid
4RepositoryType: deb4RepositoryType: deb
5BaseURI: http://archive.ubuntu.com/ubuntu/5BaseURI: http://ports.ubuntu.com/ubuntu-ports/
6BaseURI-powerpc: http://ports.ubuntu.com/6MatchURI: ports.ubuntu.com/ubuntu-ports
7MatchURI-powerpc: ports.ubuntu.com7BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
8MatchURI: archive.ubuntu.com/ubuntu8MatchURI-amd64: archive.ubuntu.com/ubuntu
9BaseURI-i386: http://archive.ubuntu.com/ubuntu/
10MatchURI-i386: archive.ubuntu.com/ubuntu
9MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors11MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
10MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors12MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
11_Description: Ubuntu 8.10 'Intrepid Ibex'13_Description: Ubuntu 8.10 'Intrepid Ibex'
@@ -36,8 +38,12 @@
36Suite: intrepid-security38Suite: intrepid-security
37ParentSuite: intrepid39ParentSuite: intrepid
38RepositoryType: deb40RepositoryType: deb
39BaseURI: http://security.ubuntu.com/ubuntu/41BaseURI: http://ports.ubuntu.com/ubuntu-ports/
40MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com42MatchURI: ports.ubuntu.com/ubuntu-ports
43BaseURI-amd64: http://security.ubuntu.com/ubuntu/
44MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
45BaseURI-i386: http://security.ubuntu.com/ubuntu/
46MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
41_Description: Important security updates47_Description: Important security updates
4248
43Suite: intrepid-updates49Suite: intrepid-updates
@@ -58,10 +64,12 @@
5864
59Suite: hardy65Suite: hardy
60RepositoryType: deb66RepositoryType: deb
61BaseURI: http://archive.ubuntu.com/ubuntu/67BaseURI: http://ports.ubuntu.com/ubuntu-ports
62MatchURI: archive.ubuntu.com/ubuntu68MatchURI: ports.ubuntu.com/ubuntu-ports
63BaseURI-powerpc: http://ports.ubuntu.com/69BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
64MatchURI-powerpc: ports.ubuntu.com70MatchURI-amd64: archive.ubuntu.com/ubuntu
71BaseURI-i386: http://archive.ubuntu.com/ubuntu/
72MatchURI-i386: archive.ubuntu.com/ubuntu
65MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors73MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
66MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors74MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
67_Description: Ubuntu 8.04 'Hardy Heron'75_Description: Ubuntu 8.04 'Hardy Heron'
@@ -92,10 +100,12 @@
92Suite: hardy-security100Suite: hardy-security
93ParentSuite: hardy101ParentSuite: hardy
94RepositoryType: deb102RepositoryType: deb
95BaseURI: http://security.ubuntu.com/ubuntu/103BaseURI: http://ports.ubuntu.com/
96MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com104MatchURI: ports.ubuntu.com/ubuntu-ports
97BaseURI-powerpc: http://ports.ubuntu.com/105BaseURI-amd64: http://security.ubuntu.com/ubuntu/
98MatchURI-powerpc: ports.ubuntu.com/ubuntu106MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
107BaseURI-i386: http://security.ubuntu.com/ubuntu/
108MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
99_Description: Important security updates109_Description: Important security updates
100110
101Suite: hardy-updates111Suite: hardy-updates
@@ -116,8 +126,14 @@
116126
117Suite: gutsy127Suite: gutsy
118RepositoryType: deb128RepositoryType: deb
119BaseURI: http://archive.ubuntu.com/ubuntu/129BaseURI: http://ports.ubuntu.com/
120MatchURI: archive.ubuntu.com/ubuntu130MatchURI: ports.ubuntu.com/ubuntu-ports
131BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
132MatchURI-amd64: archive.ubuntu.com/ubuntu
133BaseURI-i386: http://archive.ubuntu.com/ubuntu/
134MatchURI-i386: archive.ubuntu.com/ubuntu
135BaseURI-sparc: http://archive.ubuntu.com/ubuntu/
136MatchURI-sparc: archive.ubuntu.com/ubuntu
121MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors137MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
122_Description: Ubuntu 7.10 'Gutsy Gibbon'138_Description: Ubuntu 7.10 'Gutsy Gibbon'
123Component: main139Component: main
@@ -147,8 +163,14 @@
147Suite: gutsy-security163Suite: gutsy-security
148ParentSuite: gutsy164ParentSuite: gutsy
149RepositoryType: deb165RepositoryType: deb
150BaseURI: http://security.ubuntu.com/ubuntu/166BaseURI: http://ports.ubuntu.com/
151MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com167MatchURI: ports.ubuntu.com/ubuntu-ports
168BaseURI-amd64: http://security.ubuntu.com/ubuntu/
169MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
170BaseURI-i386: http://security.ubuntu.com/ubuntu/
171MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
172BaseURI-sparc: http://security.ubuntu.com/ubuntu/
173MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com
152_Description: Important security updates174_Description: Important security updates
153175
154Suite: gutsy-updates176Suite: gutsy-updates
@@ -171,6 +193,10 @@
171RepositoryType: deb193RepositoryType: deb
172BaseURI: http://archive.ubuntu.com/ubuntu/194BaseURI: http://archive.ubuntu.com/ubuntu/
173MatchURI: archive.ubuntu.com/ubuntu195MatchURI: archive.ubuntu.com/ubuntu
196BaseURI-ia64: http://ports.ubuntu.com/
197MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
198BaseURI-hppa: http://ports.ubuntu.com/
199MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
174MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors200MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
175_Description: Ubuntu 7.04 'Feisty Fawn'201_Description: Ubuntu 7.04 'Feisty Fawn'
176Component: main202Component: main
@@ -202,6 +228,10 @@
202RepositoryType: deb228RepositoryType: deb
203BaseURI: http://security.ubuntu.com/ubuntu/229BaseURI: http://security.ubuntu.com/ubuntu/
204MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com230MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
231BaseURI-ia64: http://ports.ubuntu.com/
232MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
233BaseURI-hppa: http://ports.ubuntu.com/
234MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
205_Description: Important security updates235_Description: Important security updates
206236
207Suite: feisty-updates237Suite: feisty-updates
@@ -223,6 +253,10 @@
223RepositoryType: deb253RepositoryType: deb
224BaseURI: http://archive.ubuntu.com/ubuntu/254BaseURI: http://archive.ubuntu.com/ubuntu/
225MatchURI: archive.ubuntu.com/ubuntu255MatchURI: archive.ubuntu.com/ubuntu
256BaseURI-ia64: http://ports.ubuntu.com/
257MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
258BaseURI-hppa: http://ports.ubuntu.com/
259MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
226MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors260MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
227_Description: Ubuntu 6.10 'Edgy Eft'261_Description: Ubuntu 6.10 'Edgy Eft'
228Component: main262Component: main
@@ -254,6 +288,10 @@
254RepositoryType: deb288RepositoryType: deb
255BaseURI: http://security.ubuntu.com/ubuntu/289BaseURI: http://security.ubuntu.com/ubuntu/
256MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com290MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
291BaseURI-ia64: http://ports.ubuntu.com/
292MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
293BaseURI-hppa: http://ports.ubuntu.com/
294MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
257_Description: Important security updates295_Description: Important security updates
258296
259Suite: edgy-updates297Suite: edgy-updates
@@ -275,6 +313,10 @@
275RepositoryType: deb313RepositoryType: deb
276BaseURI: http://archive.ubuntu.com/ubuntu/314BaseURI: http://archive.ubuntu.com/ubuntu/
277MatchURI: archive.ubuntu.com/ubuntu315MatchURI: archive.ubuntu.com/ubuntu
316BaseURI-ia64: http://ports.ubuntu.com/
317MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
318BaseURI-hppa: http://ports.ubuntu.com/
319MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
278MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors320MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
279_Description: Ubuntu 6.06 LTS 'Dapper Drake'321_Description: Ubuntu 6.06 LTS 'Dapper Drake'
280Component: main322Component: main
@@ -285,7 +327,7 @@
285_CompDescriptionLong: Community-maintained Open Source software327_CompDescriptionLong: Community-maintained Open Source software
286Component: restricted328Component: restricted
287_CompDescription: Non-free drivers329_CompDescription: Non-free drivers
288_CompDescriptionLong: Proprietary drivers for devices 330_CompDescriptionLong: Proprietary drivers for devices
289Component: multiverse331Component: multiverse
290_CompDescription: Restricted software (Multiverse)332_CompDescription: Restricted software (Multiverse)
291_CompDescriptionLong: Software restricted by copyright or legal issues333_CompDescriptionLong: Software restricted by copyright or legal issues
@@ -306,6 +348,10 @@
306RepositoryType: deb348RepositoryType: deb
307BaseURI: http://security.ubuntu.com/ubuntu/349BaseURI: http://security.ubuntu.com/ubuntu/
308MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com350MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
351BaseURI-ia64: http://ports.ubuntu.com/
352MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
353BaseURI-hppa: http://ports.ubuntu.com/
354MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
309_Description: Important security updates355_Description: Important security updates
310356
311Suite: dapper-updates357Suite: dapper-updates
@@ -328,6 +374,10 @@
328BaseURI: http://archive.ubuntu.com/ubuntu/374BaseURI: http://archive.ubuntu.com/ubuntu/
329MatchURI: archive.ubuntu.com/ubuntu375MatchURI: archive.ubuntu.com/ubuntu
330MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors376MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
377BaseURI-ia64: http://ports.ubuntu.com/
378MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
379BaseURI-hppa: http://ports.ubuntu.com/
380MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
331_Description: Ubuntu 5.10 'Breezy Badger'381_Description: Ubuntu 5.10 'Breezy Badger'
332Component: main382Component: main
333_CompDescription: Officially supported383_CompDescription: Officially supported
@@ -354,6 +404,10 @@
354RepositoryType: deb404RepositoryType: deb
355BaseURI: http://security.ubuntu.com/ubuntu/405BaseURI: http://security.ubuntu.com/ubuntu/
356MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com406MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
407BaseURI-ia64: http://ports.ubuntu.com/
408MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
409BaseURI-hppa: http://ports.ubuntu.com/
410MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
357_Description: Ubuntu 5.10 Security Updates411_Description: Ubuntu 5.10 Security Updates
358412
359Suite: breezy-updates413Suite: breezy-updates
@@ -370,6 +424,10 @@
370RepositoryType: deb424RepositoryType: deb
371BaseURI: http://archive.ubuntu.com/ubuntu/425BaseURI: http://archive.ubuntu.com/ubuntu/
372MatchURI: archive.ubuntu.com/ubuntu426MatchURI: archive.ubuntu.com/ubuntu
427BaseURI-ia64: http://ports.ubuntu.com/
428MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
429BaseURI-hppa: http://ports.ubuntu.com/
430MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
373MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors431MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
374_Description: Ubuntu 5.04 'Hoary Hedgehog'432_Description: Ubuntu 5.04 'Hoary Hedgehog'
375Component: main433Component: main
@@ -397,6 +455,10 @@
397RepositoryType: deb455RepositoryType: deb
398BaseURI: http://security.ubuntu.com/ubuntu/456BaseURI: http://security.ubuntu.com/ubuntu/
399MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com457MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
458BaseURI-ia64: http://ports.ubuntu.com/
459MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
460BaseURI-hppa: http://ports.ubuntu.com/
461MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
400_Description: Ubuntu 5.04 Security Updates462_Description: Ubuntu 5.04 Security Updates
401463
402Suite: hoary-updates464Suite: hoary-updates
403465
=== modified file 'debian/changelog'
--- debian/changelog 2008-09-18 12:57:22 +0000
+++ debian/changelog 2010-03-09 10:22:27 +0000
@@ -1,3 +1,11 @@
1python-apt (0.7.7.1ubuntu4.1) intrepid-proposed; urgency=low
2
3 * data/templates/Ubuntu.info.in: (LP: #531876)
4 - refactor to use ports by default for gutsy and newer releases
5 - Set appropriate exceptions to defaults for warty-intrepid
6
7 -- Emmet Hikory <persia@ubuntu.com> Sat, 06 Mar 2010 07:33:37 +0900
8
1python-apt (0.7.7.1ubuntu4) intrepid; urgency=low9python-apt (0.7.7.1ubuntu4) intrepid; urgency=low
210
3 * apt/package.py:11 * apt/package.py:

Subscribers

People subscribed via source and target branches