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
1=== modified file 'data/templates/Ubuntu.info.in'
2--- data/templates/Ubuntu.info.in 2008-09-18 12:35:14 +0000
3+++ data/templates/Ubuntu.info.in 2010-03-09 10:22:27 +0000
4@@ -2,10 +2,12 @@
5
6 Suite: intrepid
7 RepositoryType: deb
8-BaseURI: http://archive.ubuntu.com/ubuntu/
9-BaseURI-powerpc: http://ports.ubuntu.com/
10-MatchURI-powerpc: ports.ubuntu.com
11-MatchURI: archive.ubuntu.com/ubuntu
12+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
13+MatchURI: ports.ubuntu.com/ubuntu-ports
14+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
15+MatchURI-amd64: archive.ubuntu.com/ubuntu
16+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
17+MatchURI-i386: archive.ubuntu.com/ubuntu
18 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
19 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
20 _Description: Ubuntu 8.10 'Intrepid Ibex'
21@@ -36,8 +38,12 @@
22 Suite: intrepid-security
23 ParentSuite: intrepid
24 RepositoryType: deb
25-BaseURI: http://security.ubuntu.com/ubuntu/
26-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
27+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
28+MatchURI: ports.ubuntu.com/ubuntu-ports
29+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
30+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
31+BaseURI-i386: http://security.ubuntu.com/ubuntu/
32+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
33 _Description: Important security updates
34
35 Suite: intrepid-updates
36@@ -58,10 +64,12 @@
37
38 Suite: hardy
39 RepositoryType: deb
40-BaseURI: http://archive.ubuntu.com/ubuntu/
41-MatchURI: archive.ubuntu.com/ubuntu
42-BaseURI-powerpc: http://ports.ubuntu.com/
43-MatchURI-powerpc: ports.ubuntu.com
44+BaseURI: http://ports.ubuntu.com/ubuntu-ports
45+MatchURI: ports.ubuntu.com/ubuntu-ports
46+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
47+MatchURI-amd64: archive.ubuntu.com/ubuntu
48+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
49+MatchURI-i386: archive.ubuntu.com/ubuntu
50 MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors
51 MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
52 _Description: Ubuntu 8.04 'Hardy Heron'
53@@ -92,10 +100,12 @@
54 Suite: hardy-security
55 ParentSuite: hardy
56 RepositoryType: deb
57-BaseURI: http://security.ubuntu.com/ubuntu/
58-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
59-BaseURI-powerpc: http://ports.ubuntu.com/
60-MatchURI-powerpc: ports.ubuntu.com/ubuntu
61+BaseURI: http://ports.ubuntu.com/
62+MatchURI: ports.ubuntu.com/ubuntu-ports
63+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
64+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
65+BaseURI-i386: http://security.ubuntu.com/ubuntu/
66+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
67 _Description: Important security updates
68
69 Suite: hardy-updates
70@@ -116,8 +126,14 @@
71
72 Suite: gutsy
73 RepositoryType: deb
74-BaseURI: http://archive.ubuntu.com/ubuntu/
75-MatchURI: archive.ubuntu.com/ubuntu
76+BaseURI: http://ports.ubuntu.com/
77+MatchURI: ports.ubuntu.com/ubuntu-ports
78+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
79+MatchURI-amd64: archive.ubuntu.com/ubuntu
80+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
81+MatchURI-i386: archive.ubuntu.com/ubuntu
82+BaseURI-sparc: http://archive.ubuntu.com/ubuntu/
83+MatchURI-sparc: archive.ubuntu.com/ubuntu
84 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
85 _Description: Ubuntu 7.10 'Gutsy Gibbon'
86 Component: main
87@@ -147,8 +163,14 @@
88 Suite: gutsy-security
89 ParentSuite: gutsy
90 RepositoryType: deb
91-BaseURI: http://security.ubuntu.com/ubuntu/
92-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
93+BaseURI: http://ports.ubuntu.com/
94+MatchURI: ports.ubuntu.com/ubuntu-ports
95+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
96+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
97+BaseURI-i386: http://security.ubuntu.com/ubuntu/
98+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
99+BaseURI-sparc: http://security.ubuntu.com/ubuntu/
100+MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com
101 _Description: Important security updates
102
103 Suite: gutsy-updates
104@@ -171,6 +193,10 @@
105 RepositoryType: deb
106 BaseURI: http://archive.ubuntu.com/ubuntu/
107 MatchURI: archive.ubuntu.com/ubuntu
108+BaseURI-ia64: http://ports.ubuntu.com/
109+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
110+BaseURI-hppa: http://ports.ubuntu.com/
111+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
112 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
113 _Description: Ubuntu 7.04 'Feisty Fawn'
114 Component: main
115@@ -202,6 +228,10 @@
116 RepositoryType: deb
117 BaseURI: http://security.ubuntu.com/ubuntu/
118 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
119+BaseURI-ia64: http://ports.ubuntu.com/
120+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
121+BaseURI-hppa: http://ports.ubuntu.com/
122+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
123 _Description: Important security updates
124
125 Suite: feisty-updates
126@@ -223,6 +253,10 @@
127 RepositoryType: deb
128 BaseURI: http://archive.ubuntu.com/ubuntu/
129 MatchURI: archive.ubuntu.com/ubuntu
130+BaseURI-ia64: http://ports.ubuntu.com/
131+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
132+BaseURI-hppa: http://ports.ubuntu.com/
133+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
134 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
135 _Description: Ubuntu 6.10 'Edgy Eft'
136 Component: main
137@@ -254,6 +288,10 @@
138 RepositoryType: deb
139 BaseURI: http://security.ubuntu.com/ubuntu/
140 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
141+BaseURI-ia64: http://ports.ubuntu.com/
142+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
143+BaseURI-hppa: http://ports.ubuntu.com/
144+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
145 _Description: Important security updates
146
147 Suite: edgy-updates
148@@ -275,6 +313,10 @@
149 RepositoryType: deb
150 BaseURI: http://archive.ubuntu.com/ubuntu/
151 MatchURI: archive.ubuntu.com/ubuntu
152+BaseURI-ia64: http://ports.ubuntu.com/
153+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
154+BaseURI-hppa: http://ports.ubuntu.com/
155+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
156 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
157 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
158 Component: main
159@@ -285,7 +327,7 @@
160 _CompDescriptionLong: Community-maintained Open Source software
161 Component: restricted
162 _CompDescription: Non-free drivers
163-_CompDescriptionLong: Proprietary drivers for devices
164+_CompDescriptionLong: Proprietary drivers for devices
165 Component: multiverse
166 _CompDescription: Restricted software (Multiverse)
167 _CompDescriptionLong: Software restricted by copyright or legal issues
168@@ -306,6 +348,10 @@
169 RepositoryType: deb
170 BaseURI: http://security.ubuntu.com/ubuntu/
171 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
172+BaseURI-ia64: http://ports.ubuntu.com/
173+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
174+BaseURI-hppa: http://ports.ubuntu.com/
175+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
176 _Description: Important security updates
177
178 Suite: dapper-updates
179@@ -328,6 +374,10 @@
180 BaseURI: http://archive.ubuntu.com/ubuntu/
181 MatchURI: archive.ubuntu.com/ubuntu
182 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
183+BaseURI-ia64: http://ports.ubuntu.com/
184+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
185+BaseURI-hppa: http://ports.ubuntu.com/
186+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
187 _Description: Ubuntu 5.10 'Breezy Badger'
188 Component: main
189 _CompDescription: Officially supported
190@@ -354,6 +404,10 @@
191 RepositoryType: deb
192 BaseURI: http://security.ubuntu.com/ubuntu/
193 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
194+BaseURI-ia64: http://ports.ubuntu.com/
195+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
196+BaseURI-hppa: http://ports.ubuntu.com/
197+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
198 _Description: Ubuntu 5.10 Security Updates
199
200 Suite: breezy-updates
201@@ -370,6 +424,10 @@
202 RepositoryType: deb
203 BaseURI: http://archive.ubuntu.com/ubuntu/
204 MatchURI: archive.ubuntu.com/ubuntu
205+BaseURI-ia64: http://ports.ubuntu.com/
206+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
207+BaseURI-hppa: http://ports.ubuntu.com/
208+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
209 MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
210 _Description: Ubuntu 5.04 'Hoary Hedgehog'
211 Component: main
212@@ -397,6 +455,10 @@
213 RepositoryType: deb
214 BaseURI: http://security.ubuntu.com/ubuntu/
215 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
216+BaseURI-ia64: http://ports.ubuntu.com/
217+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
218+BaseURI-hppa: http://ports.ubuntu.com/
219+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
220 _Description: Ubuntu 5.04 Security Updates
221
222 Suite: hoary-updates
223
224=== modified file 'debian/changelog'
225--- debian/changelog 2008-09-18 12:57:22 +0000
226+++ debian/changelog 2010-03-09 10:22:27 +0000
227@@ -1,3 +1,11 @@
228+python-apt (0.7.7.1ubuntu4.1) intrepid-proposed; urgency=low
229+
230+ * data/templates/Ubuntu.info.in: (LP: #531876)
231+ - refactor to use ports by default for gutsy and newer releases
232+ - Set appropriate exceptions to defaults for warty-intrepid
233+
234+ -- Emmet Hikory <persia@ubuntu.com> Sat, 06 Mar 2010 07:33:37 +0900
235+
236 python-apt (0.7.7.1ubuntu4) intrepid; urgency=low
237
238 * apt/package.py:

Subscribers

People subscribed via source and target branches