diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/branch/revision-history /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/branch/revision-history diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/checkout/basis-inventory-cache /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/checkout/basis-inventory-cache diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/checkout/last-revision /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/checkout/last-revision diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/checkout/stat-cache /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/checkout/stat-cache diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/inventory.kndx /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/inventory.kndx Binary files /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/inventory.knit and /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/inventory.knit differ diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/knits/52/control-20051128105420-89bef2790aa24456.kndx /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/knits/52/control-20051128105420-89bef2790aa24456.kndx Binary files /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/knits/52/control-20051128105420-89bef2790aa24456.knit and /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/knits/52/control-20051128105420-89bef2790aa24456.knit differ diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/knits/c5/configure.ac-20051128105420-13080ab453c8e066.kndx /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/knits/c5/configure.ac-20051128105420-13080ab453c8e066.kndx Binary files /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/knits/c5/configure.ac-20051128105420-13080ab453c8e066.knit and /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/knits/c5/configure.ac-20051128105420-13080ab453c8e066.knit differ diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/knits/ed/changelog-20051128105420-71ebba242236785b.kndx /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/knits/ed/changelog-20051128105420-71ebba242236785b.kndx Binary files /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/knits/ed/changelog-20051128105420-71ebba242236785b.knit and /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/knits/ed/changelog-20051128105420-71ebba242236785b.knit differ diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/revisions.kndx /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/revisions.kndx Binary files /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/revisions.knit and /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/revisions.knit differ diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/signatures.kndx /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/signatures.kndx Binary files /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/.bzr/repository/signatures.knit and /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/.bzr/repository/signatures.knit differ diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/configure /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/configure --- /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/configure 2006-10-12 02:15:37.000000000 +0100 +++ /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/configure 2006-10-18 22:30:11.000000000 +0100 @@ -1187,7 +1187,8 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --without-debug turn off debugging? + --without-debug turn off debugging + --without-textwrap don't use libtextwrap for line-folding Some influential environment variables: CC C compiler command @@ -2671,6 +2672,102 @@ fi +# Check whether --with-textwrap was given. +if test "${with_textwrap+set}" = set; then + withval=$with_textwrap; +fi + +if test "$with_textwrap" != "no"; then + + +{ echo "$as_me:$LINENO: checking for textwrap_init in -ltextwrap" >&5 +echo $ECHO_N "checking for textwrap_init in -ltextwrap... $ECHO_C" >&6; } +if test "${ac_cv_lib_textwrap_textwrap_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltextwrap $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char textwrap_init (); +int +main () +{ +return textwrap_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_textwrap_textwrap_init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_textwrap_textwrap_init=no +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_textwrap_textwrap_init" >&5 +echo "${ECHO_T}$ac_cv_lib_textwrap_textwrap_init" >&6; } +if test $ac_cv_lib_textwrap_textwrap_init = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBTEXTWRAP 1 +_ACEOF + + LIBS="-ltextwrap $LIBS" + +fi + +fi + { echo "$as_me:$LINENO: checking for newtInit in -lnewt" >&5 echo $ECHO_N "checking for newtInit in -lnewt... $ECHO_C" >&6; } if test "${ac_cv_lib_newt_newtInit+set}" = set; then diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/configure.ac /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/configure.ac --- /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/configure.ac 2005-12-31 20:09:12.000000000 +0000 +++ /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/configure.ac 2006-10-18 22:30:07.000000000 +0100 @@ -6,12 +6,21 @@ AC_PROG_CC dnl Enable debugging? -AC_ARG_WITH(debug,[ --without-debug turn off debugging?]) +AC_ARG_WITH([debug], + AS_HELP_STRING([--without-debug], [turn off debugging])) if test "$with_debug" != "no"; then AC_DEFINE(DODEBUG) CFLAGS="$CFLAGS -g -D_DEBUG_" fi +dnl Use libtextwrap? +AC_ARG_WITH([textwrap], + AS_HELP_STRING([--without-textwrap], + [don't use libtextwrap for line-folding])) +if test "$with_textwrap" != "no"; then + AC_CHECK_LIB([textwrap], [textwrap_init]) +fi + AC_CHECK_LIB(newt, newtInit, FRONTENDS="$FRONTENDS newt", echo "*** Cannot build Newt plugin ***") diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/debian/changelog /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/debian/changelog --- /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/debian/changelog 2006-10-17 10:25:29.000000000 +0100 +++ /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/debian/changelog 2006-10-18 22:31:53.000000000 +0100 @@ -1,3 +1,9 @@ +cdebconf-keystep (0.6) edgy; urgency=low + + * Build with libtextwrap (closes: Malone #66817). + + -- Colin Watson Wed, 18 Oct 2006 22:31:50 +0100 + cdebconf-keystep (0.5) edgy; urgency=low * Accept YES and NO in step_key_present_plain state. diff -Nru /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/debian/control /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/debian/control --- /tmp/UPYcOjMAr4/cdebconf-keystep-0.5/debian/control 2006-07-11 17:41:53.000000000 +0100 +++ /tmp/VAeYLiKZm7/cdebconf-keystep-0.6/debian/control 2006-10-18 22:05:46.000000000 +0100 @@ -1,7 +1,7 @@ Source: cdebconf-keystep Priority: optional Maintainer: Tollef Fog Heen -Build-Depends: debhelper (>= 4.0.0), autotools-dev, libdebconfclient0-dev (>= 0.93), libnewt-dev +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libdebconfclient0-dev (>= 0.93), libnewt-dev, libtextwrap-dev (>= 0.1-5) Standards-Version: 3.6.2 Section: libs