diff -pruN 1.21+nmu2/debian/changelog 1.21+nmu2ubuntu1/debian/changelog --- 1.21+nmu2/debian/changelog 2021-07-22 18:51:01.000000000 +0000 +++ 1.21+nmu2ubuntu1/debian/changelog 2021-11-12 10:57:05.000000000 +0000 @@ -1,3 +1,11 @@ +pppoeconf (1.21+nmu2ubuntu1) jammy; urgency=medium + + * Resynchronize with Debian, remaining changes + debian/rules + - do not install the desktop file + + -- Sebastien Bacher Fri, 12 Nov 2021 11:57:05 +0100 + pppoeconf (1.21+nmu2) unstable; urgency=medium * Non-maintainer upload. @@ -16,6 +24,13 @@ pppoeconf (1.21+nmu1) unstable; urgency= -- Holger Levsen 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 Sun, 22 Jun 2014 10:44:49 +0200 + pppoeconf (1.21) unstable; urgency=low [ Stefan Lippers-Hollmann ] @@ -38,6 +53,15 @@ pppoeconf (1.21) unstable; urgency=low -- Gregory Colpart 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 Sun, 03 Jul 2011 13:15:14 +0200 + pppoeconf (1.20) unstable; urgency=low * Fix pppoeconf.desktop (Closes: #590202) @@ -54,6 +78,14 @@ pppoeconf (1.20) unstable; urgency=low -- Gregory Colpart 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 Thu, 03 Dec 2009 20:25:05 +0530 + pppoeconf (1.19) unstable; urgency=low * Add support for gksu when X is enabled. (Closes: #548231) @@ -70,6 +102,14 @@ pppoeconf (1.19) unstable; urgency=low -- Gregory Colpart 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 Mon, 25 Aug 2008 19:06:29 +0530 + pppoeconf (1.18) unstable; urgency=low * Fix two bashisms (read without variable). @@ -82,6 +122,16 @@ pppoeconf (1.18) unstable; urgency=low -- Gregory Colpart (evolix) 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 Mon, 03 Dec 2007 09:56:57 +0100 + pppoeconf (1.17) unstable; urgency=low * Update menu file to new section Applications/System/Administration. @@ -92,6 +142,14 @@ pppoeconf (1.17) unstable; urgency=low -- Gregory Colpart (evolix) 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 Thu, 14 Jun 2007 10:20:11 +0200 + pppoeconf (1.16) unstable; urgency=low * Fix changing usepeerdns enabled->disabled (Closes: #426392) @@ -111,6 +169,14 @@ pppoeconf (1.15) unstable; urgency=low -- Gregory Colpart (evolix) 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 Tue, 15 May 2007 11:20:05 +0200 + pppoeconf (1.14) unstable; urgency=low * Add fallback when no pppoe support. (Closes: #404322) @@ -127,6 +193,12 @@ pppoeconf (1.13) unstable; urgency=low -- Gregory Colpart (evolix) Thu, 18 Jan 2007 09:24:22 +0100 +pppoeconf (1.12ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + + -- Michael Vogt Tue, 21 Nov 2006 19:39:46 +0100 + pppoeconf (1.12) unstable; urgency=low * Correct missing backslash (Closes: #384777) @@ -155,6 +227,25 @@ pppoeconf (1.11) unstable; urgency=low -- Gregory Colpart (evolix) 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 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 Wed, 12 Jul 2006 14:58:13 +0200 + +pppoeconf (1.10ubuntu1) edgy; urgency=low + + * Resynchronise with Debian. + + -- Tollef Fog Heen Tue, 4 Jul 2006 14:56:04 +0200 + pppoeconf (1.10) unstable; urgency=low * QA upload. @@ -180,6 +271,21 @@ pppoeconf (1.9) unstable; urgency=medium -- Matej Vela 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 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 Thu, 29 Sep 2005 13:32:03 +1000 + pppoeconf (1.8) unstable; urgency=low * orphaning package, changed Maintainer @@ -199,6 +305,19 @@ pppoeconf (1.7) unstable; urgency=medium -- Eduard Bloch 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 Mon, 26 Sep 2005 12:06:01 +0200 + +pppoeconf (1.6ubuntu1) breezy; urgency=low + + * Resynchronise with Debian, resolving merge conflicts. + + -- Adam Conrad 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) @@ -237,6 +356,12 @@ pppoeconf (1.2) unstable; urgency=medium -- Eduard Bloch Fri, 18 Feb 2005 01:12:39 +0100 +pppoeconf (1.1ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Jeff Bailey 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) @@ -244,6 +369,12 @@ pppoeconf (1.1) unstable; urgency=high -- Eduard Bloch Fri, 18 Feb 2005 01:07:21 +0100 +pppoeconf (1.0.17ubuntu1) hoary; urgency=low + + * Re-sync with debian + + -- LaMont Jones 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 @@ -274,6 +405,13 @@ pppoeconf (1.0.14) unstable; urgency=low -- Eduard Bloch 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 Mon, 15 Nov 2004 15:51:13 +0000 + pppoeconf (1.0.13) unstable; urgency=low * inserting the MSS clamping rule as the first one @@ -291,6 +429,12 @@ pppoeconf (1.0.12) unstable; urgency=med -- Eduard Bloch Thu, 04 Nov 2004 15:50:46 +0100 +pppoeconf (1.0.11ubuntu1) hoary; urgency=low + + * Sync back with Debian. + + -- Daniel Stone 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 @@ -319,6 +463,20 @@ pppoeconf (1.0.9) unstable; urgency=medi -- Eduard Bloch 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 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 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 -pruN 1.21+nmu2/debian/control 1.21+nmu2ubuntu1/debian/control --- 1.21+nmu2/debian/control 2013-12-27 02:07:27.000000000 +0000 +++ 1.21+nmu2ubuntu1/debian/control 2021-11-12 10:56:59.000000000 +0000 @@ -1,7 +1,8 @@ Source: pppoeconf Section: net Priority: optional -Maintainer: Gregory Colpart +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Gregory Colpart Build-Depends-Indep: gettext (>= 0.13), docbook-to-man Build-Depends: debhelper (>= 5) Vcs-Git: git://git.debian.org/git/collab-maint/pppoeconf.git diff -pruN 1.21+nmu2/debian/rules 1.21+nmu2ubuntu1/debian/rules --- 1.21+nmu2/debian/rules 2013-12-27 02:07:25.000000000 +0000 +++ 1.21+nmu2ubuntu1/debian/rules 2021-11-12 10:56:54.000000000 +0000 @@ -50,7 +50,8 @@ install: build #install -m 644 pppoeconf.desktop $(CURDIR)/debian/pppoeconf/usr/share/applnk/System/ #install -m 755 -d $(CURDIR)/debian/pppoeconf/usr/share/gnome/apps/System #install -m 644 pppoeconf.desktop $(CURDIR)/debian/pppoeconf/usr/share/gnome/apps/System/ - install -m 644 pppoeconf.desktop $(CURDIR)/debian/pppoeconf/usr/share/applications + # No .desktop file for Ubuntu, please... + #install -m 644 pppoeconf.desktop $(CURDIR)/debian/pppoeconf/usr/share/applications #install -m 755 -d $(CURDIR)/debian/pppoeconf/usr/sbin install -m 755 pppoeconf $(CURDIR)/debian/pppoeconf/usr/sbin/ #install -m 700 -d $(CURDIR)/debian/pppoeconf/etc/ppp/ip-up.d