Apport

Merge lp:~brian-murray/apport/ep-and-focal into lp:~ubuntu-archive/apport/lp-retracer-config

  1. ep-and-focal
  2. Merge into lp-retracer-config
Proposed by Brian Murray
Status: Merged
Merged at revision: 42
Proposed branch: lp:~brian-murray/apport/ep-and-focal
Merge into: lp:~ubuntu-archive/apport/lp-retracer-config
Diff against target: 93 lines (+33/-6)
5 files modified
Ubuntu 19.10/sources-ports.list (+3/-3)
Ubuntu 19.10/sources.list (+3/-3)
Ubuntu 20.04/codename (+1/-0)
Ubuntu 20.04/sources-ports.list (+13/-0)
Ubuntu 20.04/sources.list (+13/-0)
To merge this branch: bzr merge lp:~brian-murray/apport/ep-and-focal
Reviewer Review Type Date Requested Status
Ubuntu Package Archive Administrators Pending
Review via email: mp+374746@code.launchpad.net

Description of the change

Doing that thing in the right place!

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 'Ubuntu 19.10/sources-ports.list'
2--- Ubuntu 19.10/sources-ports.list 2019-04-19 19:30:06 +0000
3+++ Ubuntu 19.10/sources-ports.list 2019-10-25 18:10:49 +0000
4@@ -1,13 +1,13 @@
5 deb http://ports.ubuntu.com/ eoan main restricted universe multiverse
6 deb http://ports.ubuntu.com/ eoan-updates main restricted universe multiverse
7-#deb http://ports.ubuntu.com/ eoan-proposed main restricted universe multiverse
8+deb http://ports.ubuntu.com/ eoan-proposed main restricted universe multiverse
9 deb http://ports.ubuntu.com/ eoan-security main restricted universe multiverse
10
11 deb-src http://ports.ubuntu.com/ eoan main restricted universe multiverse
12 deb-src http://ports.ubuntu.com/ eoan-updates main restricted universe multiverse
13-#deb-src http://ports.ubuntu.com/ eoan-proposed main restricted universe multiverse
14+deb-src http://ports.ubuntu.com/ eoan-proposed main restricted universe multiverse
15 deb-src http://ports.ubuntu.com/ eoan-security main restricted universe multiverse
16
17 deb http://ddebs.ubuntu.com eoan main restricted universe multiverse
18 deb http://ddebs.ubuntu.com eoan-updates main restricted universe multiverse
19-#deb http://ddebs.ubuntu.com eoan-proposed main restricted universe multiverse
20+deb http://ddebs.ubuntu.com eoan-proposed main restricted universe multiverse
21
22=== modified file 'Ubuntu 19.10/sources.list'
23--- Ubuntu 19.10/sources.list 2019-04-19 19:30:06 +0000
24+++ Ubuntu 19.10/sources.list 2019-10-25 18:10:49 +0000
25@@ -1,13 +1,13 @@
26 deb http://archive.ubuntu.com/ubuntu/ eoan main restricted universe multiverse
27 deb http://archive.ubuntu.com/ubuntu/ eoan-updates main restricted universe multiverse
28-#deb http://archive.ubuntu.com/ubuntu/ eoan-proposed main restricted universe multiverse
29+deb http://archive.ubuntu.com/ubuntu/ eoan-proposed main restricted universe multiverse
30 deb http://security.ubuntu.com/ubuntu/ eoan-security main restricted universe multiverse
31
32 deb-src http://archive.ubuntu.com/ubuntu/ eoan main restricted universe multiverse
33 deb-src http://archive.ubuntu.com/ubuntu/ eoan-updates main restricted universe multiverse
34-#deb-src http://archive.ubuntu.com/ubuntu/ eoan-proposed main restricted universe multiverse
35+deb-src http://archive.ubuntu.com/ubuntu/ eoan-proposed main restricted universe multiverse
36 deb-src http://security.ubuntu.com/ubuntu/ eoan-security main restricted universe multiverse
37
38 deb http://ddebs.ubuntu.com eoan main restricted universe multiverse
39 deb http://ddebs.ubuntu.com eoan-updates main restricted universe multiverse
40-#deb http://ddebs.ubuntu.com eoan-proposed main restricted universe multiverse
41+deb http://ddebs.ubuntu.com eoan-proposed main restricted universe multiverse
42
43=== added directory 'Ubuntu 20.04'
44=== added directory 'Ubuntu 20.04/arm64'
45=== added symlink 'Ubuntu 20.04/arm64/sources.list'
46=== target is u'../sources-ports.list'
47=== added directory 'Ubuntu 20.04/armhf'
48=== added symlink 'Ubuntu 20.04/armhf/sources.list'
49=== target is u'../sources-ports.list'
50=== added file 'Ubuntu 20.04/codename'
51--- Ubuntu 20.04/codename 1970-01-01 00:00:00 +0000
52+++ Ubuntu 20.04/codename 2019-10-25 18:10:49 +0000
53@@ -0,0 +1,1 @@
54+focal
55
56=== added directory 'Ubuntu 20.04/ppc64el'
57=== added symlink 'Ubuntu 20.04/ppc64el/sources.list'
58=== target is u'../sources-ports.list'
59=== added file 'Ubuntu 20.04/sources-ports.list'
60--- Ubuntu 20.04/sources-ports.list 1970-01-01 00:00:00 +0000
61+++ Ubuntu 20.04/sources-ports.list 2019-10-25 18:10:49 +0000
62@@ -0,0 +1,13 @@
63+deb http://ports.ubuntu.com/ focal main restricted universe multiverse
64+deb http://ports.ubuntu.com/ focal-updates main restricted universe multiverse
65+#deb http://ports.ubuntu.com/ focal-proposed main restricted universe multiverse
66+deb http://ports.ubuntu.com/ focal-security main restricted universe multiverse
67+
68+deb-src http://ports.ubuntu.com/ focal main restricted universe multiverse
69+deb-src http://ports.ubuntu.com/ focal-updates main restricted universe multiverse
70+#deb-src http://ports.ubuntu.com/ focal-proposed main restricted universe multiverse
71+deb-src http://ports.ubuntu.com/ focal-security main restricted universe multiverse
72+
73+deb http://ddebs.ubuntu.com focal main restricted universe multiverse
74+deb http://ddebs.ubuntu.com focal-updates main restricted universe multiverse
75+#deb http://ddebs.ubuntu.com focal-proposed main restricted universe multiverse
76
77=== added file 'Ubuntu 20.04/sources.list'
78--- Ubuntu 20.04/sources.list 1970-01-01 00:00:00 +0000
79+++ Ubuntu 20.04/sources.list 2019-10-25 18:10:49 +0000
80@@ -0,0 +1,13 @@
81+deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
82+deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
83+#deb http://archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
84+deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
85+
86+deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
87+deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
88+#deb-src http://archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
89+deb-src http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
90+
91+deb http://ddebs.ubuntu.com focal main restricted universe multiverse
92+deb http://ddebs.ubuntu.com focal-updates main restricted universe multiverse
93+#deb http://ddebs.ubuntu.com focal-proposed main restricted universe multiverse

Subscribers

People subscribed via source and target branches