Merge lp:~brian-murray/apport/jp-and-kinetic into lp:~ubuntu-archive/apport/lp-retracer-config

Proposed by Brian Murray
Status: Merged
Merged at revision: 48
Proposed branch: lp:~brian-murray/apport/jp-and-kinetic
Merge into: lp:~ubuntu-archive/apport/lp-retracer-config
Diff against target: 117 lines (+36/-9)
6 files modified
Ubuntu 21.10/sources-ports.list (+3/-3)
Ubuntu 22.04/sources-ports.list (+3/-3)
Ubuntu 22.04/sources.list (+3/-3)
Ubuntu 22.10/codename (+1/-0)
Ubuntu 22.10/sources-ports.list (+13/-0)
Ubuntu 22.10/sources.list (+13/-0)
To merge this branch: bzr merge lp:~brian-murray/apport/jp-and-kinetic
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+421104@code.launchpad.net

Description of the change

Yes, this shouldn't have to happen all the time and I'll look at sorting it out before 22.10 releases.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ubuntu 21.10/sources-ports.list'
2--- Ubuntu 21.10/sources-ports.list 2021-04-23 14:51:07 +0000
3+++ Ubuntu 21.10/sources-ports.list 2022-05-02 19:25:39 +0000
4@@ -1,13 +1,13 @@
5 deb http://ports.ubuntu.com/ impish main restricted universe multiverse
6 deb http://ports.ubuntu.com/ impish-updates main restricted universe multiverse
7-#deb http://ports.ubuntu.com/ impish-proposed main restricted universe multiverse
8+deb http://ports.ubuntu.com/ impish-proposed main restricted universe multiverse
9 deb http://ports.ubuntu.com/ impish-security main restricted universe multiverse
10
11 deb-src http://ports.ubuntu.com/ impish main restricted universe multiverse
12 deb-src http://ports.ubuntu.com/ impish-updates main restricted universe multiverse
13-#deb-src http://ports.ubuntu.com/ impish-proposed main restricted universe multiverse
14+deb-src http://ports.ubuntu.com/ impish-proposed main restricted universe multiverse
15 deb-src http://ports.ubuntu.com/ impish-security main restricted universe multiverse
16
17 deb http://ddebs.ubuntu.com impish main restricted universe multiverse
18 deb http://ddebs.ubuntu.com impish-updates main restricted universe multiverse
19-#deb http://ddebs.ubuntu.com impish-proposed main restricted universe multiverse
20+deb http://ddebs.ubuntu.com impish-proposed main restricted universe multiverse
21
22=== modified file 'Ubuntu 22.04/sources-ports.list'
23--- Ubuntu 22.04/sources-ports.list 2021-10-19 20:59:27 +0000
24+++ Ubuntu 22.04/sources-ports.list 2022-05-02 19:25:39 +0000
25@@ -1,13 +1,13 @@
26 deb http://ports.ubuntu.com/ jammy main restricted universe multiverse
27 deb http://ports.ubuntu.com/ jammy-updates main restricted universe multiverse
28-#deb http://ports.ubuntu.com/ jammy-proposed main restricted universe multiverse
29+deb http://ports.ubuntu.com/ jammy-proposed main restricted universe multiverse
30 deb http://ports.ubuntu.com/ jammy-security main restricted universe multiverse
31
32 deb-src http://ports.ubuntu.com/ jammy main restricted universe multiverse
33 deb-src http://ports.ubuntu.com/ jammy-updates main restricted universe multiverse
34-#deb-src http://ports.ubuntu.com/ jammy-proposed main restricted universe multiverse
35+deb-src http://ports.ubuntu.com/ jammy-proposed main restricted universe multiverse
36 deb-src http://ports.ubuntu.com/ jammy-security main restricted universe multiverse
37
38 deb http://ddebs.ubuntu.com jammy main restricted universe multiverse
39 deb http://ddebs.ubuntu.com jammy-updates main restricted universe multiverse
40-#deb http://ddebs.ubuntu.com jammy-proposed main restricted universe multiverse
41+deb http://ddebs.ubuntu.com jammy-proposed main restricted universe multiverse
42
43=== modified file 'Ubuntu 22.04/sources.list'
44--- Ubuntu 22.04/sources.list 2021-10-19 20:59:27 +0000
45+++ Ubuntu 22.04/sources.list 2022-05-02 19:25:39 +0000
46@@ -1,13 +1,13 @@
47 deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
48 deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
49-#deb http://archive.ubuntu.com/ubuntu/ jammy-proposed main restricted universe multiverse
50+deb http://archive.ubuntu.com/ubuntu/ jammy-proposed main restricted universe multiverse
51 deb http://security.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
52
53 deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
54 deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
55-#deb-src http://archive.ubuntu.com/ubuntu/ jammy-proposed main restricted universe multiverse
56+deb-src http://archive.ubuntu.com/ubuntu/ jammy-proposed main restricted universe multiverse
57 deb-src http://security.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
58
59 deb http://ddebs.ubuntu.com jammy main restricted universe multiverse
60 deb http://ddebs.ubuntu.com jammy-updates main restricted universe multiverse
61-#deb http://ddebs.ubuntu.com jammy-proposed main restricted universe multiverse
62+deb http://ddebs.ubuntu.com jammy-proposed main restricted universe multiverse
63
64=== added directory 'Ubuntu 22.10'
65=== added directory 'Ubuntu 22.10/arm64'
66=== added symlink 'Ubuntu 22.10/arm64/sources.list'
67=== target is '../sources-ports.list'
68=== added directory 'Ubuntu 22.10/armhf'
69=== added symlink 'Ubuntu 22.10/armhf/sources.list'
70=== target is '../sources-ports.list'
71=== added file 'Ubuntu 22.10/codename'
72--- Ubuntu 22.10/codename 1970-01-01 00:00:00 +0000
73+++ Ubuntu 22.10/codename 2022-05-02 19:25:39 +0000
74@@ -0,0 +1,1 @@
75+kinetic
76
77=== added directory 'Ubuntu 22.10/ppc64el'
78=== added symlink 'Ubuntu 22.10/ppc64el/sources.list'
79=== target is '../sources-ports.list'
80=== added file 'Ubuntu 22.10/sources-ports.list'
81--- Ubuntu 22.10/sources-ports.list 1970-01-01 00:00:00 +0000
82+++ Ubuntu 22.10/sources-ports.list 2022-05-02 19:25:39 +0000
83@@ -0,0 +1,13 @@
84+deb http://ports.ubuntu.com/ kinetic main restricted universe multiverse
85+deb http://ports.ubuntu.com/ kinetic-updates main restricted universe multiverse
86+#deb http://ports.ubuntu.com/ kinetic-proposed main restricted universe multiverse
87+deb http://ports.ubuntu.com/ kinetic-security main restricted universe multiverse
88+
89+deb-src http://ports.ubuntu.com/ kinetic main restricted universe multiverse
90+deb-src http://ports.ubuntu.com/ kinetic-updates main restricted universe multiverse
91+#deb-src http://ports.ubuntu.com/ kinetic-proposed main restricted universe multiverse
92+deb-src http://ports.ubuntu.com/ kinetic-security main restricted universe multiverse
93+
94+deb http://ddebs.ubuntu.com kinetic main restricted universe multiverse
95+deb http://ddebs.ubuntu.com kinetic-updates main restricted universe multiverse
96+#deb http://ddebs.ubuntu.com kinetic-proposed main restricted universe multiverse
97
98=== added file 'Ubuntu 22.10/sources.list'
99--- Ubuntu 22.10/sources.list 1970-01-01 00:00:00 +0000
100+++ Ubuntu 22.10/sources.list 2022-05-02 19:25:39 +0000
101@@ -0,0 +1,13 @@
102+deb http://archive.ubuntu.com/ubuntu/ kinetic main restricted universe multiverse
103+deb http://archive.ubuntu.com/ubuntu/ kinetic-updates main restricted universe multiverse
104+#deb http://archive.ubuntu.com/ubuntu/ kinetic-proposed main restricted universe multiverse
105+deb http://security.ubuntu.com/ubuntu/ kinetic-security main restricted universe multiverse
106+
107+deb-src http://archive.ubuntu.com/ubuntu/ kinetic main restricted universe multiverse
108+deb-src http://archive.ubuntu.com/ubuntu/ kinetic-updates main restricted universe multiverse
109+#deb-src http://archive.ubuntu.com/ubuntu/ kinetic-proposed main restricted universe multiverse
110+deb-src http://security.ubuntu.com/ubuntu/ kinetic-security main restricted universe multiverse
111+
112+deb http://ddebs.ubuntu.com kinetic main restricted universe multiverse
113+deb http://ddebs.ubuntu.com kinetic-updates main restricted universe multiverse
114+#deb http://ddebs.ubuntu.com kinetic-proposed main restricted universe multiverse
115
116=== added symlink 'Ubuntu Kylin 22.10'
117=== target is 'Ubuntu 22.10'

Subscribers

People subscribed via source and target branches