diff -u isdnutils-3.12.20071127/debian/rules isdnutils-3.12.20071127/debian/rules --- isdnutils-3.12.20071127/debian/rules +++ isdnutils-3.12.20071127/debian/rules @@ -33,8 +33,8 @@ for d in capi20; do \ echo "Regenerating autotools files in $$d ..."; \ cd $$d; \ - echo " aclocal-1.8"; aclocal-1.8; \ - echo " automake-1.8"; automake-1.8 --add-missing; \ + echo " aclocal-1.10"; aclocal-1.10; \ + echo " automake-1.10"; automake-1.10 --add-missing; \ cd ..; \ done diff -u isdnutils-3.12.20071127/debian/changelog isdnutils-3.12.20071127/debian/changelog --- isdnutils-3.12.20071127/debian/changelog +++ isdnutils-3.12.20071127/debian/changelog @@ -1,3 +1,15 @@ +isdnutils (1:3.12.20071127-0ubuntu2) intrepid; urgency=low + + [ Jean-Baptiste Lallement ] + * isdnutils-base.postrm : Remove echo when /etc/isdn can't be deleted + This triggers an error purging the package (LP: #281324) + + [ Daniel Holbach ] + * debian/control, debian/rules: move from automake-1.8 to automake-1.10, we + don't have the former anymore. + + -- Daniel Holbach Mon, 13 Oct 2008 15:07:57 +0200 + isdnutils (1:3.12.20071127-0ubuntu1) hardy; urgency=low * Updated upstream snapshot (3 fixes only): diff -u isdnutils-3.12.20071127/debian/control isdnutils-3.12.20071127/debian/control --- isdnutils-3.12.20071127/debian/control +++ isdnutils-3.12.20071127/debian/control @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Paul Slootman Uploaders: Paul Slootman , Matthias Klose Standards-Version: 3.7.2 -Build-Depends: debhelper (>=4.1.16), bzip2, libncurses5-dev | libncurses-dev, xutils | imake, tcl8.3-dev, linuxdoc-tools (>=0.9.20), groff, libtool, libxaw7-dev, libreadline5-dev | libreadline-dev, libpcap0.8-dev, autotools-dev, automake1.4, automake1.7, automake1.8, autoconf2.13, autoconf, libssl-dev, psutils, lsb-release, po-debconf, ppp-dev +Build-Depends: debhelper (>=4.1.16), bzip2, libncurses5-dev | libncurses-dev, xutils | imake, tcl8.3-dev, linuxdoc-tools (>=0.9.20), groff, libtool, libxaw7-dev, libreadline5-dev | libreadline-dev, libpcap0.8-dev, autotools-dev, automake1.4, automake1.7, automake1.10, autoconf2.13, autoconf, libssl-dev, psutils, lsb-release, po-debconf, ppp-dev Package: isdnutils Priority: optional diff -u isdnutils-3.12.20071127/debian/isdnutils-base.postrm isdnutils-3.12.20071127/debian/isdnutils-base.postrm --- isdnutils-3.12.20071127/debian/isdnutils-base.postrm +++ isdnutils-3.12.20071127/debian/isdnutils-base.postrm @@ -5,10 +5,7 @@ case "$1" in purge) - rmdir /etc/isdn 2>/dev/null || true - if [ -d /etc/isdn ]; then - echo "There are still files in /etc/isdn/ that you may want to remove manually." - fi + rmdir --ignore-fail-on-non-empty /etc/isdn ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)