Merge ~0xnishit/ubuntu/+source/pppoeconf:merge-1.22-resolute into ubuntu/+source/pppoeconf:debian/sid

[Nishit Majithia]

[Nishit Majithia (0xnishit)]

More information mentioned in the bug: LP #2131902

[Skia (skia)]

LGTM, sponsored:
❯ dput ubuntu ../pppoeconf_1.22ubuntu1_source.changes
Uploading pppoeconf using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running updatemaintainer: Stop if ubuntu changes are without ubuntu maintainer.
running checksum: verify checksums before uploading
running nobug: Stop if uploading without any bug reference.
running check-debs: makes sure the upload contains a binary package
running ppaforppaonly: Stop uploads to the archive with or to ppa without ~ppa suffix.
running badauthor: Stop if uploading with root@ or ubuntu@ email adresses.
running placeholderbug: Stop if using common placeholder numbers as bug reference.
running gitubuntu: Warn if uploading without git-ubuntu Vcs-* entries.
running required-fields: check whether a field is present and non-empty in the changes file
running releasemismatch: Warn about mismatching suffixesg e.g. focal with a XX.YY not being 20.04
running gpg: check GnuPG signatures before the upload
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
running suite-mismatch: check the target distribution for common errors
Uploading pppoeconf_1.22ubuntu1.dsc
Uploading pppoeconf_1.22ubuntu1.tar.xz
Uploading pppoeconf_1.22ubuntu1_source.buildinfo
Uploading pppoeconf_1.22ubuntu1_source.changes

For next time, please also push the `git-ubuntu` tags (split/..., logical/..., reconstruct/..., and old/ubuntu, old/debian, new/debian). That helps a lot in the review.
Additionally, it's nice when people link the PPA they tested in directly from the MP (that's where we do the review), and also mention either the autopkgtest results, or in that case, that there is no autopkgtest available hence no results to show.

review: Approve

Unmerged commits

c1f8af7... by Nishit Majithia on 2025-11-19

reconstruct-changelog

7df2b85... by Nishit Majithia on 2025-11-19

update-maintainer

6599b56... by Nishit Majithia on 2025-11-19

merge-changelogs

64d0939... by Nishit Majithia on 2025-11-19

do not install the desktop file

diff --git a/debian/changelog b/debian/changelog
index 16488eb..91dee02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pppoeconf (1.22ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2131902). Remaining changes:
+    - do not install the desktop file
+
+ -- Nishit Majithia <[e-mail]>  Wed, 19 Nov 2025 15:24:14 +0530
+
 pppoeconf (1.22) unstable; urgency=medium
 
   * Team upload of Debian team
@@ -25,6 +32,13 @@ pppoeconf (1.22) unstable; urgency=medium
 
  -- Andreas Tille <[e-mail]>  Sun, 01 Dec 2024 22:24:42 +0100
 
+pppoeconf (1.21+nmu3ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2065201). Remaining changes:
+    - do not install the desktop file
+
+ -- Zixing Liu <[e-mail]>  Wed, 08 May 2024 12:16:22 -0600
+
 pppoeconf (1.21+nmu3) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -32,6 +46,14 @@ pppoeconf (1.21+nmu3) unstable; urgency=high
 
  -- Adrian Bunk <[e-mail]>  Fri, 10 Feb 2023 01:46:49 +0200
 
+pppoeconf (1.21+nmu2ubuntu1) jammy; urgency=medium
+
+  * Resynchronize with Debian, remaining changes
+    debian/rules
+    - do not install the desktop file
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 12 Nov 2021 11:57:05 +0100
+
 pppoeconf (1.21+nmu2) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -50,6 +72,13 @@ pppoeconf (1.21+nmu1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Fri, 01 Jan 2021 16:42:10 +0100
 
+pppoeconf (1.21ubuntu1) utopic; urgency=medium
+
+  * Merge from debian unstable (LP: #1332926). Remaining changes:
+    - do not install the desktop file
+
+ -- Angel Abad <[e-mail]>  Sun, 22 Jun 2014 10:44:49 +0200
+
 pppoeconf (1.21) unstable; urgency=low
 
   [ Stefan Lippers-Hollmann ]
@@ -72,6 +101,15 @@ pppoeconf (1.21) unstable; urgency=low
 
  -- Gregory Colpart <[e-mail]>  Fri, 27 Dec 2013 03:03:25 +0100
 
+pppoeconf (1.20ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable (LP: #799149). Remaining changes:
+    - do not install the desktop file
+  * Dropped change (Superceeded in debian)
+    - do not depend on modconf
+
+ -- Bhavani Shankar <[e-mail]>  Sun, 03 Jul 2011 13:15:14 +0200
+
 pppoeconf (1.20) unstable; urgency=low
 
   * Fix pppoeconf.desktop (Closes: #590202)
@@ -88,6 +126,14 @@ pppoeconf (1.20) unstable; urgency=low
 
  -- Gregory Colpart <[e-mail]>  Sat, 23 Apr 2011 11:32:03 +0200
 
+pppoeconf (1.19ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes: LP: #492141
+    - do not install the desktop file
+    - do not depend on modconf
+
+ -- Bhavani Shankar <[e-mail]>  Thu, 03 Dec 2009 20:25:05 +0530
+
 pppoeconf (1.19) unstable; urgency=low
 
   * Add support for gksu when X is enabled. (Closes: #548231)
@@ -104,6 +150,14 @@ pppoeconf (1.19) unstable; urgency=low
 
  -- Gregory Colpart <[e-mail]>  Sat, 07 Nov 2009 22:34:41 +0100
 
+pppoeconf (1.18ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #260870)
+    - do not install the desktop file
+    - do not depend on modconf
+
+ -- Bhavani Shankar <[e-mail]>  Mon, 25 Aug 2008 19:06:29 +0530
+
 pppoeconf (1.18) unstable; urgency=low
 
   * Fix two bashisms (read without variable).
@@ -116,6 +170,16 @@ pppoeconf (1.18) unstable; urgency=low
 
  -- Gregory Colpart (evolix) <[e-mail]>  Sun, 27 Jul 2008 03:06:31 +0200
 
+pppoeconf (1.17ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - do not install the desktop file
+    - do not depend on modconf
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+
+ -- Michael Vogt <[e-mail]>  Mon, 03 Dec 2007 09:56:57 +0100
+
 pppoeconf (1.17) unstable; urgency=low
 
   * Update menu file to new section Applications/System/Administration.
@@ -126,6 +190,14 @@ pppoeconf (1.17) unstable; urgency=low
 
  -- Gregory Colpart (evolix) <[e-mail]>  Sat, 11 Aug 2007 03:12:04 +0200
 
+pppoeconf (1.16ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - do not install the desktop file
+    - do not depend on modconf
+
+ -- Michael Vogt <[e-mail]>  Thu, 14 Jun 2007 10:20:11 +0200
+
 pppoeconf (1.16) unstable; urgency=low
 
   * Fix changing usepeerdns enabled->disabled (Closes: #426392)
@@ -145,6 +217,14 @@ pppoeconf (1.15) unstable; urgency=low
 
  -- Gregory Colpart (evolix) <[e-mail]>  Sun, 27 May 2007 22:30:26 +0200
 
+pppoeconf (1.14ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - do not install the desktop file
+    - do not depend on modconf
+
+ -- Michael Vogt <[e-mail]>  Tue, 15 May 2007 11:20:05 +0200
+
 pppoeconf (1.14) unstable; urgency=low
 
   * Add fallback when no pppoe support. (Closes: #404322)
@@ -161,6 +241,12 @@ pppoeconf (1.13) unstable; urgency=low
 
  -- Gregory Colpart (evolix) <[e-mail]>  Thu, 18 Jan 2007 09:24:22 +0100
 
+pppoeconf (1.12ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Michael Vogt <[e-mail]>  Tue, 21 Nov 2006 19:39:46 +0100
+
 pppoeconf (1.12) unstable; urgency=low
 
   * Correct missing backslash (Closes: #384777)
@@ -189,6 +275,25 @@ pppoeconf (1.11) unstable; urgency=low
 
  -- Gregory Colpart (evolix) <[e-mail]>  Mon, 24 Jul 2006 00:36:58 +0200
 
+pppoeconf (1.10ubuntu3) edgy; urgency=low
+
+  * Remove broken zenity support, backport from Debian pppoeconf 1.12
+    (Closes Malone: #54383)
+
+ -- Adrien Cunin <[e-mail]>  Sat, 21 Oct 2006 18:52:23 +0200
+
+pppoeconf (1.10ubuntu2) edgy; urgency=low
+
+  * Remove dependency on modconf to get this installable again.
+
+ -- Tollef Fog Heen <[e-mail]>  Wed, 12 Jul 2006 14:58:13 +0200
+
+pppoeconf (1.10ubuntu1) edgy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Tollef Fog Heen <[e-mail]>  Tue,  4 Jul 2006 14:56:04 +0200
+
 pppoeconf (1.10) unstable; urgency=low
 
   * QA upload.
@@ -214,6 +319,21 @@ pppoeconf (1.9) unstable; urgency=medium
 
  -- Matej Vela <[e-mail]>  Sun, 22 Jan 2006 11:15:31 +0100
 
+pppoeconf (1.8ubuntu2) breezy; urgency=low
+
+  * Apply patch from Daniel Haler to properly create pppoe stanzas in
+    /etc/network/interfaces, which should really close #10080 this time.
+
+ -- Adam Conrad <[e-mail]>  Tue, 11 Oct 2005 00:09:12 +1000
+
+pppoeconf (1.8ubuntu1) breezy; urgency=low
+
+  * Merge with Debian, bringing in a fix for Ubuntu bug #10080.
+  * Drop all our changes (which have been committed upstream), except
+    for the removal of the .desktop file that we don't want.
+
+ -- Adam Conrad <[e-mail]>  Thu, 29 Sep 2005 13:32:03 +1000
+
 pppoeconf (1.8) unstable; urgency=low
 
   * orphaning package, changed Maintainer
@@ -233,6 +353,19 @@ pppoeconf (1.7) unstable; urgency=medium
 
  -- Eduard Bloch <[e-mail]>  Sat, 30 Apr 2005 18:56:22 +0200
 
+pppoeconf (1.6ubuntu2) breezy; urgency=low
+
+  * Handle non-eth*-named devices and include a nic-$iface line for those
+    instead of the usual "plugin rp-pppoe.so $iface".  Ubuntu #16127
+
+ -- Tollef Fog Heen <[e-mail]>  Mon, 26 Sep 2005 12:06:01 +0200
+
+pppoeconf (1.6ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian, resolving merge conflicts.
+
+ -- Adam Conrad <[e-mail]>  Thu, 21 Apr 2005 09:23:41 +0000
+
 pppoeconf (1.6) unstable; urgency=high
 
   * replaced -p with -o in the iptables call (stupid typo, closes: #304219)
@@ -271,6 +404,12 @@ pppoeconf (1.2) unstable; urgency=medium
 
  -- Eduard Bloch <[e-mail]>  Fri, 18 Feb 2005 01:12:39 +0100
 
+pppoeconf (1.1ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Jeff Bailey <[e-mail]>  Fri,  4 Mar 2005 07:41:17 -0500
+
 pppoeconf (1.1) unstable; urgency=high
 
   * do not stumble over PPP usernames with slashes within (closes: #295315)
@@ -278,6 +417,12 @@ pppoeconf (1.1) unstable; urgency=high
 
  -- Eduard Bloch <[e-mail]>  Fri, 18 Feb 2005 01:07:21 +0100
 
+pppoeconf (1.0.17ubuntu1) hoary; urgency=low
+
+  * Re-sync with debian
+
+ -- LaMont Jones <[e-mail]>  Tue, 11 Jan 2005 20:23:21 -0700
+
 pppoeconf (1.0.17) unstable; urgency=medium
 
   * documented the potential need to fix the 0clampmss in README.Debian
@@ -308,6 +453,13 @@ pppoeconf (1.0.14) unstable; urgency=low
 
  -- Eduard Bloch <[e-mail]>  Sat, 11 Dec 2004 13:44:46 +0100
 
+pppoeconf (1.0.13ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+  * Take over debian/po/{pppoeconf.pot,templates.pot} from unstable.
+
+ -- Matthias Klose <[e-mail]>  Mon, 15 Nov 2004 15:51:13 +0000
+
 pppoeconf (1.0.13) unstable; urgency=low
 
   * inserting the MSS clamping rule as the first one
@@ -325,6 +477,12 @@ pppoeconf (1.0.12) unstable; urgency=medium
 
  -- Eduard Bloch <[e-mail]>  Thu, 04 Nov 2004 15:50:46 +0100
 
+pppoeconf (1.0.11ubuntu1) hoary; urgency=low
+
+  * Sync back with Debian.
+
+ -- Daniel Stone <[e-mail]>  Tue,  2 Nov 2004 16:28:59 +0100
+
 pppoeconf (1.0.11) unstable; urgency=low
 
   * moved chmod +x to chmod 755 - which otherwise would break because of the
@@ -353,6 +511,20 @@ pppoeconf (1.0.9) unstable; urgency=medium
 
  -- Eduard Bloch <[e-mail]>  Sat, 18 Sep 2004 10:16:19 +0200
 
+pppoeconf (1.0.8ubuntu2) warty; urgency=low
+
+  * Call pppoe_on_boot, instead of ppp_on_boot.dsl.
+
+ -- Daniel Stone <[e-mail]>  Thu, 23 Sep 2004 13:49:39 +1000
+
+pppoeconf (1.0.8ubuntu1) warty; urgency=low
+
+  * New version which integrates with pppoe-enabled ppp, no longer requires
+    the pppoe package
+  * Don't install the .desktop file
+
+ -- Matt Zimmerman <[e-mail]>  Tue,  7 Sep 2004 08:23:40 -0700
+
 pppoeconf (1.0.8) unstable; urgency=low
 
   * Setting group and permissions of self-created dsl-provider file according
diff --git a/debian/control b/debian/control
index 51519dd..e0ace9e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: pppoeconf
-Maintainer: Gregory Colpart <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Gregory Colpart <[e-mail]>
 Section: net
 Priority: optional
 Build-Depends: debhelper-compat (= 13)
diff --git a/debian/install b/debian/install
index 4a31581..58f7ca1 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,4 @@
-pppoeconf.desktop	usr/share/applications
+# No .desktop file for Ubuntu, please...
+#pppoeconf.desktop	usr/share/applications
 pppoeconf		usr/sbin
 pppoeconf.png		usr/share/pixmaps