Merge lp:~brian-murray/apport/fp-and-groovy into lp:~ubuntu-archive/apport/lp-retracer-config

Proposed by Brian Murray
Status: Merged
Merged at revision: 43
Proposed branch: lp:~brian-murray/apport/fp-and-groovy
Merge into: lp:~ubuntu-archive/apport/lp-retracer-config
Diff against target: 93 lines (+33/-6)
5 files modified
Ubuntu 20.04/sources-ports.list (+3/-3)
Ubuntu 20.04/sources.list (+3/-3)
Ubuntu 20.10/codename (+1/-0)
Ubuntu 20.10/sources-ports.list (+13/-0)
Ubuntu 20.10/sources.list (+13/-0)
To merge this branch: bzr merge lp:~brian-murray/apport/fp-and-groovy
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+382944@code.launchpad.net

Description of the change

For the Launchpad retracers.

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
=== modified file 'Ubuntu 20.04/sources-ports.list'
--- Ubuntu 20.04/sources-ports.list 2019-10-25 17:58:15 +0000
+++ Ubuntu 20.04/sources-ports.list 2020-04-24 19:04:58 +0000
@@ -1,13 +1,13 @@
1deb http://ports.ubuntu.com/ focal main restricted universe multiverse1deb http://ports.ubuntu.com/ focal main restricted universe multiverse
2deb http://ports.ubuntu.com/ focal-updates main restricted universe multiverse2deb http://ports.ubuntu.com/ focal-updates main restricted universe multiverse
3#deb http://ports.ubuntu.com/ focal-proposed main restricted universe multiverse3deb http://ports.ubuntu.com/ focal-proposed main restricted universe multiverse
4deb http://ports.ubuntu.com/ focal-security main restricted universe multiverse4deb http://ports.ubuntu.com/ focal-security main restricted universe multiverse
55
6deb-src http://ports.ubuntu.com/ focal main restricted universe multiverse6deb-src http://ports.ubuntu.com/ focal main restricted universe multiverse
7deb-src http://ports.ubuntu.com/ focal-updates main restricted universe multiverse7deb-src http://ports.ubuntu.com/ focal-updates main restricted universe multiverse
8#deb-src http://ports.ubuntu.com/ focal-proposed main restricted universe multiverse8deb-src http://ports.ubuntu.com/ focal-proposed main restricted universe multiverse
9deb-src http://ports.ubuntu.com/ focal-security main restricted universe multiverse9deb-src http://ports.ubuntu.com/ focal-security main restricted universe multiverse
1010
11deb http://ddebs.ubuntu.com focal main restricted universe multiverse11deb http://ddebs.ubuntu.com focal main restricted universe multiverse
12deb http://ddebs.ubuntu.com focal-updates main restricted universe multiverse12deb http://ddebs.ubuntu.com focal-updates main restricted universe multiverse
13#deb http://ddebs.ubuntu.com focal-proposed main restricted universe multiverse13deb http://ddebs.ubuntu.com focal-proposed main restricted universe multiverse
1414
=== modified file 'Ubuntu 20.04/sources.list'
--- Ubuntu 20.04/sources.list 2019-10-25 17:58:15 +0000
+++ Ubuntu 20.04/sources.list 2020-04-24 19:04:58 +0000
@@ -1,13 +1,13 @@
1deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse1deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
2deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse2deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
3#deb http://archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse3deb http://archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
4deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse4deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
55
6deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse6deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
7deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse7deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
8#deb-src http://archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse8deb-src http://archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
9deb-src http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse9deb-src http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
1010
11deb http://ddebs.ubuntu.com focal main restricted universe multiverse11deb http://ddebs.ubuntu.com focal main restricted universe multiverse
12deb http://ddebs.ubuntu.com focal-updates main restricted universe multiverse12deb http://ddebs.ubuntu.com focal-updates main restricted universe multiverse
13#deb http://ddebs.ubuntu.com focal-proposed main restricted universe multiverse13deb http://ddebs.ubuntu.com focal-proposed main restricted universe multiverse
1414
=== added directory 'Ubuntu 20.10'
=== added directory 'Ubuntu 20.10/arm64'
=== added symlink 'Ubuntu 20.10/arm64/sources.list'
=== target is '../sources-ports.list'
=== added directory 'Ubuntu 20.10/armhf'
=== added symlink 'Ubuntu 20.10/armhf/sources.list'
=== target is '../sources-ports.list'
=== added file 'Ubuntu 20.10/codename'
--- Ubuntu 20.10/codename 1970-01-01 00:00:00 +0000
+++ Ubuntu 20.10/codename 2020-04-24 19:04:58 +0000
@@ -0,0 +1,1 @@
1groovy
02
=== added directory 'Ubuntu 20.10/ppc64el'
=== added symlink 'Ubuntu 20.10/ppc64el/sources.list'
=== target is '../sources-ports.list'
=== added file 'Ubuntu 20.10/sources-ports.list'
--- Ubuntu 20.10/sources-ports.list 1970-01-01 00:00:00 +0000
+++ Ubuntu 20.10/sources-ports.list 2020-04-24 19:04:58 +0000
@@ -0,0 +1,13 @@
1deb http://ports.ubuntu.com/ groovy main restricted universe multiverse
2deb http://ports.ubuntu.com/ groovy-updates main restricted universe multiverse
3#deb http://ports.ubuntu.com/ groovy-proposed main restricted universe multiverse
4deb http://ports.ubuntu.com/ groovy-security main restricted universe multiverse
5
6deb-src http://ports.ubuntu.com/ groovy main restricted universe multiverse
7deb-src http://ports.ubuntu.com/ groovy-updates main restricted universe multiverse
8#deb-src http://ports.ubuntu.com/ groovy-proposed main restricted universe multiverse
9deb-src http://ports.ubuntu.com/ groovy-security main restricted universe multiverse
10
11deb http://ddebs.ubuntu.com groovy main restricted universe multiverse
12deb http://ddebs.ubuntu.com groovy-updates main restricted universe multiverse
13#deb http://ddebs.ubuntu.com groovy-proposed main restricted universe multiverse
014
=== added file 'Ubuntu 20.10/sources.list'
--- Ubuntu 20.10/sources.list 1970-01-01 00:00:00 +0000
+++ Ubuntu 20.10/sources.list 2020-04-24 19:04:58 +0000
@@ -0,0 +1,13 @@
1deb http://archive.ubuntu.com/ubuntu/ groovy main restricted universe multiverse
2deb http://archive.ubuntu.com/ubuntu/ groovy-updates main restricted universe multiverse
3#deb http://archive.ubuntu.com/ubuntu/ groovy-proposed main restricted universe multiverse
4deb http://security.ubuntu.com/ubuntu/ groovy-security main restricted universe multiverse
5
6deb-src http://archive.ubuntu.com/ubuntu/ groovy main restricted universe multiverse
7deb-src http://archive.ubuntu.com/ubuntu/ groovy-updates main restricted universe multiverse
8#deb-src http://archive.ubuntu.com/ubuntu/ groovy-proposed main restricted universe multiverse
9deb-src http://security.ubuntu.com/ubuntu/ groovy-security main restricted universe multiverse
10
11deb http://ddebs.ubuntu.com groovy main restricted universe multiverse
12deb http://ddebs.ubuntu.com groovy-updates main restricted universe multiverse
13#deb http://ddebs.ubuntu.com groovy-proposed main restricted universe multiverse

Subscribers

People subscribed via source and target branches