diff -rN -u old-new-patch/ppp-2.4.4rel/debian/changelog new-new-patch/ppp-2.4.4rel/debian/changelog
--- old-new-patch/ppp-2.4.4rel/debian/changelog 2006-09-28 01:25:02.000000000 +0300
+++ new-new-patch/ppp-2.4.4rel/debian/changelog 2006-09-28 01:25:02.000000000 +0300
@@ -1,3 +1,18 @@
+ppp (2.4.4rel-3) unstable; urgency=low
+
+  [ Eddy Petrișor ]
+  * fix the place where rp-pppoe.so is placed in (Closes: #384121)
+  * assign to ppp-udeb a higher priority in the menu so it runs before netcfg
+    since loading ppp-udeb means, most likely, the user wants to install via
+    PPPoE and that would be the primary connection type.
+  * do not run db_stop in ppp-udeb.postinst as it is not wise to do that in
+    D-I; also it generates all kinds of strange debconf problems
+    (Closes: #385150)
+  * it is normal for apt-install to return 1 when the package is queued;
+    ppp-udeb will no longer fail in that case
+
+ -- Eddy Petrișor <eddy.petrisor@gmail.com>  Thu, 28 Sep 2006 01:08:13 +0300
+
 ppp (2.4.4rel-2) unstable; urgency=high

   * Make postinst not fail if /dev/MAKEDEV does not exist yet.
diff -rN -u old-new-patch/ppp-2.4.4rel/debian/control new-new-patch/ppp-2.4.4rel/debian/control
--- old-new-patch/ppp-2.4.4rel/debian/control   2006-09-28 01:25:02.000000000 +0300
+++ new-new-patch/ppp-2.4.4rel/debian/control   2006-09-28 01:25:02.000000000 +0300
@@ -25,7 +25,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ethernet-card-detection, ppp-modules, di-utils
 Provides: configured-network
-XB-Installer-Menu-Item: 18
+XB-Installer-Menu-Item: 17
 Description: Point-to-Point Protocol (PPP) daemon
  The Point-to-Point Protocol (PPP) provides a standard way to transmit
  datagrams over a serial link, as well as a standard way for the machines
diff -rN -u old-new-patch/ppp-2.4.4rel/debian/patches/000_fix_internal_version.diff new-new-patch/ppp-2.4.4rel/debian/patches/000_fix_internal_version.diff
--- old-new-patch/ppp-2.4.4rel/debian/patches/000_fix_internal_version.diff     1970-01-01 02:00:00.000000000 +0200
+++ new-new-patch/ppp-2.4.4rel/debian/patches/000_fix_internal_version.diff     2006-09-28 01:25:02.000000000 +0300
@@ -0,0 +1,10 @@
+diff -ruN ppp-2.4.4.orig/pppd/patchlevel.h ppp-2.4.4/pppd/patchlevel.h
+--- ppp-2.4.4.orig/pppd/patchlevel.h   2006-06-28 03:21:23.000000000 +0300
++++ ppp-2.4.4/pppd/patchlevel.h        2006-08-24 17:36:00.000000000 +0300
+@@ -1,4 +1,4 @@
+ /* $Id: patchlevel.h,v 1.66 2006/06/28 00:21:23 paulus Exp $ */
+
+-#define VERSION               "2.4.4"
++#define VERSION               "2.4.4b1"
+ #define DATE          "28 June 2006"
diff -rN -u old-new-patch/ppp-2.4.4rel/debian/ppp-udeb.postinst new-new-patch/ppp-2.4.4rel/debian/ppp-udeb.postinst
--- old-new-patch/ppp-2.4.4rel/debian/ppp-udeb.postinst 2006-09-28 01:25:02.000000000 +0300
+++ new-new-patch/ppp-2.4.4rel/debian/ppp-udeb.postinst 2006-09-28 01:25:02.000000000 +0300
@@ -117,7 +117,6 @@
 db_unregister ppp/password
 db_unregister ppp/username

-db_stop

 cat <<EOF > /etc/ppp/peers/pppoe
 # kernel space PPPoE driver example configuration
@@ -195,7 +194,7 @@
 # FIXME - how can this be improved?
 [ -e /etc/resolv.conf ] || ln -s /etc/ppp/resolv.conf /etc/resolv.conf

-log-output apt-install ppp
+log-output apt-install ppp || true

 #DEBHELPER#


