diff -Nru /tmp/dCOKgZXWaW/pppoeconf-1.10ubuntu2/debian/changelog /tmp/SzCtbJxX98/pppoeconf-1.10ubuntu3/debian/changelog --- /tmp/dCOKgZXWaW/pppoeconf-1.10ubuntu2/debian/changelog 2006-07-12 14:58:17.000000000 +0200 +++ /tmp/SzCtbJxX98/pppoeconf-1.10ubuntu3/debian/changelog 2006-10-21 18:53:12.000000000 +0200 @@ -1,3 +1,10 @@ +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. diff -Nru /tmp/dCOKgZXWaW/pppoeconf-1.10ubuntu2/debian/control /tmp/SzCtbJxX98/pppoeconf-1.10ubuntu3/debian/control --- /tmp/dCOKgZXWaW/pppoeconf-1.10ubuntu2/debian/control 2006-07-12 14:58:04.000000000 +0200 +++ /tmp/SzCtbJxX98/pppoeconf-1.10ubuntu3/debian/control 2006-10-21 18:52:13.000000000 +0200 @@ -10,6 +10,6 @@ Architecture: all Depends: whiptail-provider | whiptail, ppp (>= 2.4.2+20040428-2) | pppoe (>= 3.0), ppp (>= 2.4.1.uus2-4), gettext-base (>= 0.13), sed (>= 3.95) Recommends: locales -Suggests: xdialog | zenity +Suggests: xdialog Description: configures PPPoE/ADSL connections User-friendly tool for initial configuration of a DSL (PPPoE) connection. diff -Nru /tmp/dCOKgZXWaW/pppoeconf-1.10ubuntu2/pppoeconf /tmp/SzCtbJxX98/pppoeconf-1.10ubuntu3/pppoeconf --- /tmp/dCOKgZXWaW/pppoeconf-1.10ubuntu2/pppoeconf 2006-07-04 14:52:34.000000000 +0200 +++ /tmp/SzCtbJxX98/pppoeconf-1.10ubuntu3/pppoeconf 2006-10-21 18:50:18.000000000 +0200 @@ -15,14 +15,9 @@ # Set up (X)dialog - added by Fabian Franz XDIALOG_HIGH_DIALOG_COMPAT=1 export XDIALOG_HIGH_DIALOG_COMPAT -if [ -n "$DISPLAY" ] ; then - if [ -x /usr/bin/Xdialog ] ; then - DIALOG="Xdialog" - X11="-X" - elif [ -x /usr/bin/zenity ] ; then - DIALOG="zenity" - X11="-X" - fi +if [ -n "$DISPLAY" ] && [ -x /usr/bin/Xdialog ] ; then + DIALOG="Xdialog" + X11="-X" fi # SUID wrapper for KNOPPIX added by Klaus Knopper