diff -Nru ppp-2.4.6/debian/changelog ppp-2.4.6/debian/changelog --- ppp-2.4.6/debian/changelog 2014-04-17 21:20:08.000000000 +0000 +++ ppp-2.4.6/debian/changelog 2014-05-01 13:24:40.000000000 +0000 @@ -1,3 +1,9 @@ +ppp (2.4.6-2+rpi1) jessie-staging; urgency=medium + + * Tweak conflicts to accomodate version 1:3.25+dfsg1-3.3+rpi1 of isdnutils. + + -- Peter Michael Green Thu, 01 May 2014 13:23:40 +0000 + ppp (2.4.6-2) unstable; urgency=medium * d/rules: Fix ppp-udeb module path by using a shell expression for PPPDDIR. diff -Nru ppp-2.4.6/debian/control ppp-2.4.6/debian/control --- ppp-2.4.6/debian/control 2014-04-17 21:20:08.000000000 +0000 +++ ppp-2.4.6/debian/control 2014-05-01 13:25:22.000000000 +0000 @@ -13,7 +13,7 @@ Package: ppp Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-modules, libpam-runtime, procps -Breaks: network-manager (<< 0.9.8.8-7~), network-manager-pptp (<< 0.9.8.4-3~), pppdcapiplugin (<< 1:3.25+dfsg1-3.4~) +Breaks: network-manager (<< 0.9.8.8-7~), network-manager-pptp (<< 0.9.8.4-3~), pppdcapiplugin (<< 1:3.25+dfsg1-3.3+rpi1~) Description: Point-to-Point Protocol (PPP) - daemon The Point-to-Point Protocol provides a standard way to transmit datagrams over a serial link, as well as a standard way for the machines