Merge lp:~jibel/ubuntu/saucy/python-apt/AddSaucy_lp1174562 into lp:~ubuntu-core-dev/python-apt/ubuntu

Proposed by Jean-Baptiste Lallement
Status: Merged
Merge reported by: Jean-Baptiste Lallement
Merged at revision: not available
Proposed branch: lp:~jibel/ubuntu/saucy/python-apt/AddSaucy_lp1174562
Merge into: lp:~ubuntu-core-dev/python-apt/ubuntu
Diff against target: 142 lines (+125/-0)
2 files modified
data/templates/Ubuntu.info.in (+119/-0)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~jibel/ubuntu/saucy/python-apt/AddSaucy_lp1174562
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+161631@code.launchpad.net

Description of the change

This patch adds Saucy to Ubuntu.info template.

To post a comment you must log in.

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 2012-11-07 13:14:05 +0000
3+++ data/templates/Ubuntu.info.in 2013-04-30 15:47:30 +0000
4@@ -1,5 +1,124 @@
5 _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
6
7+Suite: saucy
8+RepositoryType: deb
9+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
10+MatchURI: ports.ubuntu.com/ubuntu-ports
11+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
12+MatchURI-amd64: archive.ubuntu.com/ubuntu
13+BaseURI-i386: http://archive.ubuntu.com/ubuntu
14+MatchURI-i386: archive.ubuntu.com/ubuntu
15+MirrorsFile-amd64: Ubuntu.mirrors
16+MirrorsFile-i386: Ubuntu.mirrors
17+_Description: Ubuntu 13.10 'Saucy Salamander'
18+Component: main
19+_CompDescription: Officially supported
20+_CompDescriptionLong: Canonical-supported free and open-source software
21+Component: universe
22+_CompDescription: Community-maintained
23+_CompDescriptionLong: Community-maintained free and open-source software
24+Component: restricted
25+_CompDescription: Non-free drivers
26+_CompDescriptionLong: Proprietary drivers for devices
27+Component: multiverse
28+ParentComponent: universe
29+_CompDescription: Restricted software
30+_CompDescriptionLong: Software restricted by copyright or legal issues
31+
32+Suite: saucy
33+ParentSuite: saucy
34+RepositoryType: deb-src
35+BaseURI: http://archive.ubuntu.com/ubuntu/
36+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
37+_Description: Ubuntu 13.10 'Saucy Salamander'
38+
39+Suite: saucy
40+RepositoryType: deb
41+MatchName: .*
42+BaseURI: cdrom:\[Ubuntu.*13.10
43+MatchURI: cdrom:\[Ubuntu.*13.10
44+_Description: Cdrom with Ubuntu 13.10 'Saucy Salamander'
45+Available: False
46+Component: main
47+_CompDescription: Officially supported
48+Component: restricted
49+_CompDescription: Restricted copyright
50+
51+Suite: saucy
52+Official: false
53+RepositoryType: deb
54+BaseURI: http://archive.canonical.com
55+MatchURI: archive.canonical.com
56+_Description: Canonical Partners
57+Component: partner
58+_CompDescription: Software packaged by Canonical for their partners
59+_CompDescriptionLong: This software is not part of Ubuntu.
60+
61+Suite: saucy
62+Official: false
63+RepositoryType: deb
64+BaseURI: http://extras.ubuntu.com
65+MatchURI: extras.ubuntu.com
66+_Description: Independent
67+Component: main
68+_CompDescription: Provided by third-party software developers
69+_CompDescriptionLong: Software offered by third party developers.
70+
71+Suite: saucy-security
72+ParentSuite: saucy
73+RepositoryType: deb
74+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
75+MatchURI: ports.ubuntu.com/ubuntu-ports
76+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
77+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
78+BaseURI-i386: http://security.ubuntu.com/ubuntu/
79+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
80+_Description: Important security updates
81+
82+Suite: saucy-security
83+ParentSuite: saucy
84+RepositoryType: deb-src
85+BaseURI: http://archive.ubuntu.com/ubuntu/
86+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
87+_Description: Important security updates
88+
89+Suite: saucy-updates
90+ParentSuite: saucy
91+RepositoryType: deb
92+_Description: Recommended updates
93+
94+Suite: saucy-updates
95+ParentSuite: saucy
96+RepositoryType: deb-src
97+BaseURI: http://archive.ubuntu.com/ubuntu/
98+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
99+_Description: Recommended updates
100+
101+Suite: saucy-proposed
102+ParentSuite: saucy
103+RepositoryType: deb
104+_Description: Pre-released updates
105+
106+Suite: saucy-proposed
107+ParentSuite: saucy
108+RepositoryType: deb-src
109+BaseURI: http://archive.ubuntu.com/ubuntu/
110+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
111+_Description: Pre-released updates
112+
113+Suite: saucy-backports
114+ParentSuite: saucy
115+RepositoryType: deb
116+_Description: Unsupported updates
117+
118+Suite: saucy-backports
119+ParentSuite: saucy
120+RepositoryType: deb-src
121+BaseURI: http://archive.ubuntu.com/ubuntu/
122+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
123+_Description: Unsupported updates
124+
125+
126 Suite: raring
127 RepositoryType: deb
128 BaseURI: http://ports.ubuntu.com/ubuntu-ports/
129
130=== modified file 'debian/changelog'
131--- debian/changelog 2013-02-22 08:06:49 +0000
132+++ debian/changelog 2013-04-30 15:47:30 +0000
133@@ -1,3 +1,9 @@
134+python-apt (0.8.8ubuntu7) saucy; urgency=low
135+
136+ * Add "Saucy Salamander" to templates/Ubuntu.info. LP: #1174562
137+
138+ -- Jean-Baptiste Lallement <jean-baptiste.lallement@canonical.com> Mon, 29 Apr 2013 15:15:23 -0700
139+
140 python-apt (0.8.8ubuntu6) raring; urgency=low
141
142 * Make python{,3}-apt{,-dbg} Multi-Arch: allowed. LP: #1130709.

Subscribers

People subscribed via source and target branches

to all changes: