Merge ~liushuyu-011/ubuntu/+source/pppoeconf:merge-lp2065201 into ubuntu/+source/pppoeconf:debian/sid

Proposed by Zixing Liu
Status: Needs review
Proposed branch: ~liushuyu-011/ubuntu/+source/pppoeconf:merge-lp2065201
Merge into: ubuntu/+source/pppoeconf:debian/sid
Diff against target: 320 lines (+169/-2)
3 files modified
debian/changelog (+165/-0)
debian/control (+2/-1)
debian/rules (+2/-1)
Reviewer Review Type Date Requested Status
Simon Quigley (community) Approve
Review via email: mp+465796@code.launchpad.net

Description of the change

This MP merges pppoeconf changes from Debian unstable into Ubuntu Oracular.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16127242/+listing-archive-extra

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) :
review: Approve

Unmerged commits

41f89a4... by Zixing Liu

update-maintainer

cfb868d... by Zixing Liu

reconstruct-changelog

78674ed... by Zixing Liu

merge-changelogs

4830665... by Zixing Liu

    - do not install the desktop file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 36d8c0f..26ba8ae 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+pppoeconf (1.21+nmu3ubuntu1) oracular; urgency=medium
7+
8+ * Merge with Debian unstable (LP: #2065201). Remaining changes:
9+ - do not install the desktop file
10+
11+ -- Zixing Liu <zixing.liu@canonical.com> Wed, 08 May 2024 12:16:22 -0600
12+
13 pppoeconf (1.21+nmu3) unstable; urgency=high
14
15 * Non-maintainer upload.
16@@ -5,6 +12,14 @@ pppoeconf (1.21+nmu3) unstable; urgency=high
17
18 -- Adrian Bunk <bunk@debian.org> Fri, 10 Feb 2023 01:46:49 +0200
19
20+pppoeconf (1.21+nmu2ubuntu1) jammy; urgency=medium
21+
22+ * Resynchronize with Debian, remaining changes
23+ debian/rules
24+ - do not install the desktop file
25+
26+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 12 Nov 2021 11:57:05 +0100
27+
28 pppoeconf (1.21+nmu2) unstable; urgency=medium
29
30 * Non-maintainer upload.
31@@ -23,6 +38,13 @@ pppoeconf (1.21+nmu1) unstable; urgency=medium
32
33 -- Holger Levsen <holger@debian.org> Fri, 01 Jan 2021 16:42:10 +0100
34
35+pppoeconf (1.21ubuntu1) utopic; urgency=medium
36+
37+ * Merge from debian unstable (LP: #1332926). Remaining changes:
38+ - do not install the desktop file
39+
40+ -- Angel Abad <angelabad@ubuntu.com> Sun, 22 Jun 2014 10:44:49 +0200
41+
42 pppoeconf (1.21) unstable; urgency=low
43
44 [ Stefan Lippers-Hollmann ]
45@@ -45,6 +67,15 @@ pppoeconf (1.21) unstable; urgency=low
46
47 -- Gregory Colpart <reg@debian.org> Fri, 27 Dec 2013 03:03:25 +0100
48
49+pppoeconf (1.20ubuntu1) oneiric; urgency=low
50+
51+ * Merge from debian unstable (LP: #799149). Remaining changes:
52+ - do not install the desktop file
53+ * Dropped change (Superceeded in debian)
54+ - do not depend on modconf
55+
56+ -- Bhavani Shankar <bhavi@ubuntu.com> Sun, 03 Jul 2011 13:15:14 +0200
57+
58 pppoeconf (1.20) unstable; urgency=low
59
60 * Fix pppoeconf.desktop (Closes: #590202)
61@@ -61,6 +92,14 @@ pppoeconf (1.20) unstable; urgency=low
62
63 -- Gregory Colpart <reg@debian.org> Sat, 23 Apr 2011 11:32:03 +0200
64
65+pppoeconf (1.19ubuntu1) lucid; urgency=low
66+
67+ * Merge from debian testing. Remaining changes: LP: #492141
68+ - do not install the desktop file
69+ - do not depend on modconf
70+
71+ -- Bhavani Shankar <right2bhavi@gmail.com> Thu, 03 Dec 2009 20:25:05 +0530
72+
73 pppoeconf (1.19) unstable; urgency=low
74
75 * Add support for gksu when X is enabled. (Closes: #548231)
76@@ -77,6 +116,14 @@ pppoeconf (1.19) unstable; urgency=low
77
78 -- Gregory Colpart <reg@debian.org> Sat, 07 Nov 2009 22:34:41 +0100
79
80+pppoeconf (1.18ubuntu1) intrepid; urgency=low
81+
82+ * Merge from debian unstable, remaining changes: (LP: #260870)
83+ - do not install the desktop file
84+ - do not depend on modconf
85+
86+ -- Bhavani Shankar <right2bhavi@gmail.com> Mon, 25 Aug 2008 19:06:29 +0530
87+
88 pppoeconf (1.18) unstable; urgency=low
89
90 * Fix two bashisms (read without variable).
91@@ -89,6 +136,16 @@ pppoeconf (1.18) unstable; urgency=low
92
93 -- Gregory Colpart (evolix) <reg@evolix.fr> Sun, 27 Jul 2008 03:06:31 +0200
94
95+pppoeconf (1.17ubuntu1) hardy; urgency=low
96+
97+ * Merge from debian unstable, remaining changes:
98+ - do not install the desktop file
99+ - do not depend on modconf
100+ - Modify Maintainer value to match the DebianMaintainerField
101+ specification.
102+
103+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 03 Dec 2007 09:56:57 +0100
104+
105 pppoeconf (1.17) unstable; urgency=low
106
107 * Update menu file to new section Applications/System/Administration.
108@@ -99,6 +156,14 @@ pppoeconf (1.17) unstable; urgency=low
109
110 -- Gregory Colpart (evolix) <reg@evolix.fr> Sat, 11 Aug 2007 03:12:04 +0200
111
112+pppoeconf (1.16ubuntu1) gutsy; urgency=low
113+
114+ * Merge from debian unstable, remaining changes:
115+ - do not install the desktop file
116+ - do not depend on modconf
117+
118+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jun 2007 10:20:11 +0200
119+
120 pppoeconf (1.16) unstable; urgency=low
121
122 * Fix changing usepeerdns enabled->disabled (Closes: #426392)
123@@ -118,6 +183,14 @@ pppoeconf (1.15) unstable; urgency=low
124
125 -- Gregory Colpart (evolix) <reg@evolix.fr> Sun, 27 May 2007 22:30:26 +0200
126
127+pppoeconf (1.14ubuntu1) gutsy; urgency=low
128+
129+ * Merge from debian unstable, remaining changes:
130+ - do not install the desktop file
131+ - do not depend on modconf
132+
133+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 May 2007 11:20:05 +0200
134+
135 pppoeconf (1.14) unstable; urgency=low
136
137 * Add fallback when no pppoe support. (Closes: #404322)
138@@ -134,6 +207,12 @@ pppoeconf (1.13) unstable; urgency=low
139
140 -- Gregory Colpart (evolix) <reg@evolix.fr> Thu, 18 Jan 2007 09:24:22 +0100
141
142+pppoeconf (1.12ubuntu1) feisty; urgency=low
143+
144+ * Merge from debian unstable.
145+
146+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 21 Nov 2006 19:39:46 +0100
147+
148 pppoeconf (1.12) unstable; urgency=low
149
150 * Correct missing backslash (Closes: #384777)
151@@ -162,6 +241,25 @@ pppoeconf (1.11) unstable; urgency=low
152
153 -- Gregory Colpart (evolix) <reg@evolix.fr> Mon, 24 Jul 2006 00:36:58 +0200
154
155+pppoeconf (1.10ubuntu3) edgy; urgency=low
156+
157+ * Remove broken zenity support, backport from Debian pppoeconf 1.12
158+ (Closes Malone: #54383)
159+
160+ -- Adrien Cunin <adri2000@gmail.com> Sat, 21 Oct 2006 18:52:23 +0200
161+
162+pppoeconf (1.10ubuntu2) edgy; urgency=low
163+
164+ * Remove dependency on modconf to get this installable again.
165+
166+ -- Tollef Fog Heen <tfheen@ubuntu.com> Wed, 12 Jul 2006 14:58:13 +0200
167+
168+pppoeconf (1.10ubuntu1) edgy; urgency=low
169+
170+ * Resynchronise with Debian.
171+
172+ -- Tollef Fog Heen <tfheen@ubuntu.com> Tue, 4 Jul 2006 14:56:04 +0200
173+
174 pppoeconf (1.10) unstable; urgency=low
175
176 * QA upload.
177@@ -187,6 +285,21 @@ pppoeconf (1.9) unstable; urgency=medium
178
179 -- Matej Vela <vela@debian.org> Sun, 22 Jan 2006 11:15:31 +0100
180
181+pppoeconf (1.8ubuntu2) breezy; urgency=low
182+
183+ * Apply patch from Daniel Haler to properly create pppoe stanzas in
184+ /etc/network/interfaces, which should really close #10080 this time.
185+
186+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 11 Oct 2005 00:09:12 +1000
187+
188+pppoeconf (1.8ubuntu1) breezy; urgency=low
189+
190+ * Merge with Debian, bringing in a fix for Ubuntu bug #10080.
191+ * Drop all our changes (which have been committed upstream), except
192+ for the removal of the .desktop file that we don't want.
193+
194+ -- Adam Conrad <adconrad@ubuntu.com> Thu, 29 Sep 2005 13:32:03 +1000
195+
196 pppoeconf (1.8) unstable; urgency=low
197
198 * orphaning package, changed Maintainer
199@@ -206,6 +319,19 @@ pppoeconf (1.7) unstable; urgency=medium
200
201 -- Eduard Bloch <blade@debian.org> Sat, 30 Apr 2005 18:56:22 +0200
202
203+pppoeconf (1.6ubuntu2) breezy; urgency=low
204+
205+ * Handle non-eth*-named devices and include a nic-$iface line for those
206+ instead of the usual "plugin rp-pppoe.so $iface". Ubuntu #16127
207+
208+ -- Tollef Fog Heen <tfheen@ubuntu.com> Mon, 26 Sep 2005 12:06:01 +0200
209+
210+pppoeconf (1.6ubuntu1) breezy; urgency=low
211+
212+ * Resynchronise with Debian, resolving merge conflicts.
213+
214+ -- Adam Conrad <adconrad@0c3.net> Thu, 21 Apr 2005 09:23:41 +0000
215+
216 pppoeconf (1.6) unstable; urgency=high
217
218 * replaced -p with -o in the iptables call (stupid typo, closes: #304219)
219@@ -244,6 +370,12 @@ pppoeconf (1.2) unstable; urgency=medium
220
221 -- Eduard Bloch <blade@debian.org> Fri, 18 Feb 2005 01:12:39 +0100
222
223+pppoeconf (1.1ubuntu1) hoary; urgency=low
224+
225+ * Resynchronise with Debian.
226+
227+ -- Jeff Bailey <jbailey@ubuntu.com> Fri, 4 Mar 2005 07:41:17 -0500
228+
229 pppoeconf (1.1) unstable; urgency=high
230
231 * do not stumble over PPP usernames with slashes within (closes: #295315)
232@@ -251,6 +383,12 @@ pppoeconf (1.1) unstable; urgency=high
233
234 -- Eduard Bloch <blade@debian.org> Fri, 18 Feb 2005 01:07:21 +0100
235
236+pppoeconf (1.0.17ubuntu1) hoary; urgency=low
237+
238+ * Re-sync with debian
239+
240+ -- LaMont Jones <lamont@ubuntu.com> Tue, 11 Jan 2005 20:23:21 -0700
241+
242 pppoeconf (1.0.17) unstable; urgency=medium
243
244 * documented the potential need to fix the 0clampmss in README.Debian
245@@ -281,6 +419,13 @@ pppoeconf (1.0.14) unstable; urgency=low
246
247 -- Eduard Bloch <blade@debian.org> Sat, 11 Dec 2004 13:44:46 +0100
248
249+pppoeconf (1.0.13ubuntu1) hoary; urgency=low
250+
251+ * Resynchronise with Debian.
252+ * Take over debian/po/{pppoeconf.pot,templates.pot} from unstable.
253+
254+ -- Matthias Klose <m@klose.in-berlin.de> Mon, 15 Nov 2004 15:51:13 +0000
255+
256 pppoeconf (1.0.13) unstable; urgency=low
257
258 * inserting the MSS clamping rule as the first one
259@@ -298,6 +443,12 @@ pppoeconf (1.0.12) unstable; urgency=medium
260
261 -- Eduard Bloch <blade@debian.org> Thu, 04 Nov 2004 15:50:46 +0100
262
263+pppoeconf (1.0.11ubuntu1) hoary; urgency=low
264+
265+ * Sync back with Debian.
266+
267+ -- Daniel Stone <daniel.stone@canonical.com> Tue, 2 Nov 2004 16:28:59 +0100
268+
269 pppoeconf (1.0.11) unstable; urgency=low
270
271 * moved chmod +x to chmod 755 - which otherwise would break because of the
272@@ -326,6 +477,20 @@ pppoeconf (1.0.9) unstable; urgency=medium
273
274 -- Eduard Bloch <blade@debian.org> Sat, 18 Sep 2004 10:16:19 +0200
275
276+pppoeconf (1.0.8ubuntu2) warty; urgency=low
277+
278+ * Call pppoe_on_boot, instead of ppp_on_boot.dsl.
279+
280+ -- Daniel Stone <daniel.stone@canonical.com> Thu, 23 Sep 2004 13:49:39 +1000
281+
282+pppoeconf (1.0.8ubuntu1) warty; urgency=low
283+
284+ * New version which integrates with pppoe-enabled ppp, no longer requires
285+ the pppoe package
286+ * Don't install the .desktop file
287+
288+ -- Matt Zimmerman <mdz@canonical.com> Tue, 7 Sep 2004 08:23:40 -0700
289+
290 pppoeconf (1.0.8) unstable; urgency=low
291
292 * Setting group and permissions of self-created dsl-provider file according
293diff --git a/debian/control b/debian/control
294index 0b487e0..7fd6e42 100644
295--- a/debian/control
296+++ b/debian/control
297@@ -1,7 +1,8 @@
298 Source: pppoeconf
299 Section: net
300 Priority: optional
301-Maintainer: Gregory Colpart <reg@debian.org>
302+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
303+XSBC-Original-Maintainer: Gregory Colpart <reg@debian.org>
304 Build-Depends-Indep: gettext (>= 0.13), docbook-to-man
305 Build-Depends: debhelper (>= 5)
306 Vcs-Git: git://git.debian.org/git/collab-maint/pppoeconf.git
307diff --git a/debian/rules b/debian/rules
308index ed20c2c..b4db8a8 100755
309--- a/debian/rules
310+++ b/debian/rules
311@@ -50,7 +50,8 @@ install: build
312 #install -m 644 pppoeconf.desktop $(CURDIR)/debian/pppoeconf/usr/share/applnk/System/
313 #install -m 755 -d $(CURDIR)/debian/pppoeconf/usr/share/gnome/apps/System
314 #install -m 644 pppoeconf.desktop $(CURDIR)/debian/pppoeconf/usr/share/gnome/apps/System/
315- install -m 644 pppoeconf.desktop $(CURDIR)/debian/pppoeconf/usr/share/applications
316+ # No .desktop file for Ubuntu, please...
317+ #install -m 644 pppoeconf.desktop $(CURDIR)/debian/pppoeconf/usr/share/applications
318 #install -m 755 -d $(CURDIR)/debian/pppoeconf/usr/sbin
319 install -m 755 pppoeconf $(CURDIR)/debian/pppoeconf/usr/sbin/
320 #install -m 700 -d $(CURDIR)/debian/pppoeconf/etc/ppp/ip-up.d

Subscribers

People subscribed via source and target branches