Apport

Merge lp:~brian-murray/apport/gp-and-hirsute into lp:~ubuntu-archive/apport/lp-retracer-config

  1. gp-and-hirsute
  2. Merge into lp-retracer-config
Proposed by Brian Murray
Status: Merged
Merged at revision: 45
Proposed branch: lp:~brian-murray/apport/gp-and-hirsute
Merge into: lp:~ubuntu-archive/apport/lp-retracer-config
Diff against target: 98 lines (+33/-6)
5 files modified
Ubuntu 20.10/sources-ports.list (+3/-3)
Ubuntu 20.10/sources.list (+3/-3)
Ubuntu 21.04/codename (+1/-0)
Ubuntu 21.04/sources-ports.list (+13/-0)
Ubuntu 21.04/sources.list (+13/-0)
To merge this branch: bzr merge lp:~brian-murray/apport/gp-and-hirsute
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+392714@code.launchpad.net

Description of the change

It's that wonderful time of year.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) :
review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches