Apport

Merge lp:~brian-murray/apport/hp-and-impish into lp:~ubuntu-archive/apport/lp-retracer-config

  1. hp-and-impish
  2. Merge into lp-retracer-config
Proposed by Brian Murray
Status: Merged
Merged at revision: 46
Proposed branch: lp:~brian-murray/apport/hp-and-impish
Merge into: lp:~ubuntu-archive/apport/lp-retracer-config
Diff against target: 98 lines (+33/-6)
5 files modified
Ubuntu 21.04/sources-ports.list (+3/-3)
Ubuntu 21.04/sources.list (+3/-3)
Ubuntu 21.10/codename (+1/-0)
Ubuntu 21.10/sources-ports.list (+13/-0)
Ubuntu 21.10/sources.list (+13/-0)
To merge this branch: bzr merge lp:~brian-murray/apport/hp-and-impish
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Ubuntu Package Archive Administrators Pending
Review via email: mp+401715@code.launchpad.net
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=== removed symlink 'Ubuntu 21.04/Ubuntu Kylin 21.04'
2=== target was 'Ubuntu Kylin 21.04'
3=== modified file 'Ubuntu 21.04/sources-ports.list'
4--- Ubuntu 21.04/sources-ports.list 2020-10-23 15:44:29 +0000
5+++ Ubuntu 21.04/sources-ports.list 2021-04-23 14:53:56 +0000
6@@ -1,13 +1,13 @@
7 deb http://ports.ubuntu.com/ hirsute main restricted universe multiverse
8 deb http://ports.ubuntu.com/ hirsute-updates main restricted universe multiverse
9-#deb http://ports.ubuntu.com/ hirsute-proposed main restricted universe multiverse
10+deb http://ports.ubuntu.com/ hirsute-proposed main restricted universe multiverse
11 deb http://ports.ubuntu.com/ hirsute-security main restricted universe multiverse
12
13 deb-src http://ports.ubuntu.com/ hirsute main restricted universe multiverse
14 deb-src http://ports.ubuntu.com/ hirsute-updates main restricted universe multiverse
15-#deb-src http://ports.ubuntu.com/ hirsute-proposed main restricted universe multiverse
16+deb-src http://ports.ubuntu.com/ hirsute-proposed main restricted universe multiverse
17 deb-src http://ports.ubuntu.com/ hirsute-security main restricted universe multiverse
18
19 deb http://ddebs.ubuntu.com hirsute main restricted universe multiverse
20 deb http://ddebs.ubuntu.com hirsute-updates main restricted universe multiverse
21-#deb http://ddebs.ubuntu.com hirsute-proposed main restricted universe multiverse
22+deb http://ddebs.ubuntu.com hirsute-proposed main restricted universe multiverse
23
24=== modified file 'Ubuntu 21.04/sources.list'
25--- Ubuntu 21.04/sources.list 2020-10-23 15:44:29 +0000
26+++ Ubuntu 21.04/sources.list 2021-04-23 14:53:56 +0000
27@@ -1,13 +1,13 @@
28 deb http://archive.ubuntu.com/ubuntu/ hirsute main restricted universe multiverse
29 deb http://archive.ubuntu.com/ubuntu/ hirsute-updates main restricted universe multiverse
30-#deb http://archive.ubuntu.com/ubuntu/ hirsute-proposed main restricted universe multiverse
31+deb http://archive.ubuntu.com/ubuntu/ hirsute-proposed main restricted universe multiverse
32 deb http://security.ubuntu.com/ubuntu/ hirsute-security main restricted universe multiverse
33
34 deb-src http://archive.ubuntu.com/ubuntu/ hirsute main restricted universe multiverse
35 deb-src http://archive.ubuntu.com/ubuntu/ hirsute-updates main restricted universe multiverse
36-#deb-src http://archive.ubuntu.com/ubuntu/ hirsute-proposed main restricted universe multiverse
37+deb-src http://archive.ubuntu.com/ubuntu/ hirsute-proposed main restricted universe multiverse
38 deb-src http://security.ubuntu.com/ubuntu/ hirsute-security main restricted universe multiverse
39
40 deb http://ddebs.ubuntu.com hirsute main restricted universe multiverse
41 deb http://ddebs.ubuntu.com hirsute-updates main restricted universe multiverse
42-#deb http://ddebs.ubuntu.com hirsute-proposed main restricted universe multiverse
43+deb http://ddebs.ubuntu.com hirsute-proposed main restricted universe multiverse
44
45=== added directory 'Ubuntu 21.10'
46=== added directory 'Ubuntu 21.10/arm64'
47=== added symlink 'Ubuntu 21.10/arm64/sources.list'
48=== target is '../sources-ports.list'
49=== added directory 'Ubuntu 21.10/armhf'
50=== added symlink 'Ubuntu 21.10/armhf/sources.list'
51=== target is '../sources-ports.list'
52=== added file 'Ubuntu 21.10/codename'
53--- Ubuntu 21.10/codename 1970-01-01 00:00:00 +0000
54+++ Ubuntu 21.10/codename 2021-04-23 14:53:56 +0000
55@@ -0,0 +1,1 @@
56+impish
57
58=== added directory 'Ubuntu 21.10/ppc64el'
59=== added symlink 'Ubuntu 21.10/ppc64el/sources.list'
60=== target is '../sources-ports.list'
61=== added file 'Ubuntu 21.10/sources-ports.list'
62--- Ubuntu 21.10/sources-ports.list 1970-01-01 00:00:00 +0000
63+++ Ubuntu 21.10/sources-ports.list 2021-04-23 14:53:56 +0000
64@@ -0,0 +1,13 @@
65+deb http://ports.ubuntu.com/ impish main restricted universe multiverse
66+deb http://ports.ubuntu.com/ impish-updates main restricted universe multiverse
67+#deb http://ports.ubuntu.com/ impish-proposed main restricted universe multiverse
68+deb http://ports.ubuntu.com/ impish-security main restricted universe multiverse
69+
70+deb-src http://ports.ubuntu.com/ impish main restricted universe multiverse
71+deb-src http://ports.ubuntu.com/ impish-updates main restricted universe multiverse
72+#deb-src http://ports.ubuntu.com/ impish-proposed main restricted universe multiverse
73+deb-src http://ports.ubuntu.com/ impish-security main restricted universe multiverse
74+
75+deb http://ddebs.ubuntu.com impish main restricted universe multiverse
76+deb http://ddebs.ubuntu.com impish-updates main restricted universe multiverse
77+#deb http://ddebs.ubuntu.com impish-proposed main restricted universe multiverse
78
79=== added file 'Ubuntu 21.10/sources.list'
80--- Ubuntu 21.10/sources.list 1970-01-01 00:00:00 +0000
81+++ Ubuntu 21.10/sources.list 2021-04-23 14:53:56 +0000
82@@ -0,0 +1,13 @@
83+deb http://archive.ubuntu.com/ubuntu/ impish main restricted universe multiverse
84+deb http://archive.ubuntu.com/ubuntu/ impish-updates main restricted universe multiverse
85+#deb http://archive.ubuntu.com/ubuntu/ impish-proposed main restricted universe multiverse
86+deb http://security.ubuntu.com/ubuntu/ impish-security main restricted universe multiverse
87+
88+deb-src http://archive.ubuntu.com/ubuntu/ impish main restricted universe multiverse
89+deb-src http://archive.ubuntu.com/ubuntu/ impish-updates main restricted universe multiverse
90+#deb-src http://archive.ubuntu.com/ubuntu/ impish-proposed main restricted universe multiverse
91+deb-src http://security.ubuntu.com/ubuntu/ impish-security main restricted universe multiverse
92+
93+deb http://ddebs.ubuntu.com impish main restricted universe multiverse
94+deb http://ddebs.ubuntu.com impish-updates main restricted universe multiverse
95+#deb http://ddebs.ubuntu.com impish-proposed main restricted universe multiverse
96
97=== added symlink 'Ubuntu Kylin 21.10'
98=== target is 'Ubuntu 21.10'

Subscribers

People subscribed via source and target branches