diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-06-18 11:31:43 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-06-18 11:31:43 -0700 |
| commit | 52e7de027a9204963baf31238c271cde9a7d8fff (patch) | |
| tree | 70ed040c99f032eccf9d9757f3ba29ee50037216 | |
| parent | 770e38401ae5489d58d7dd1f45cf27813d100d5e (diff) | |
| parent | 70cf5bebe6902411c3ec4ea38990ea49ce0b948a (diff) | |
| download | vyatta-bash-52e7de027a9204963baf31238c271cde9a7d8fff.tar.gz vyatta-bash-52e7de027a9204963baf31238c271cde9a7d8fff.zip | |
Merge branch 'larkspur' of suva.vyatta.com:/git/vyatta-bash into larkspur
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 8 insertions, 5 deletions
@@ -2627,8 +2627,6 @@ fi - - echo "" echo "Beginning configuration for bash-$BASHVERS-$RELSTATUS for ${host_cpu}-${host_vendor}-${host_os}" echo "" @@ -28367,7 +28365,6 @@ HELPDIR!$HELPDIR$ac_delim HELPDIRDEFINE!$HELPDIRDEFINE$ac_delim HELPINSTALL!$HELPINSTALL$ac_delim HELPSTRINGS!$HELPSTRINGS$ac_delim -AUDIT_LIB!$AUDIT_LIB$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim LDFLAGS!$LDFLAGS$ac_delim @@ -28404,6 +28401,7 @@ INSTALL_DATA!$INSTALL_DATA$ac_delim AR!$AR$ac_delim RANLIB!$RANLIB$ac_delim YACC!$YACC$ac_delim +YFLAGS!$YFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -28445,7 +28443,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -YFLAGS!$YFLAGS$ac_delim SET_MAKE!$SET_MAKE$ac_delim MAKE_SHELL!$MAKE_SHELL$ac_delim SIZE!$SIZE$ac_delim @@ -28502,7 +28499,7 @@ LOCAL_DEFS!$LOCAL_DEFS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/debian/changelog b/debian/changelog index 1ad2212..98c31e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-bash (3.2-4-vyatta-2) unstable; urgency=low + + * Remove AUDIT_SHELL option + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Thu, 17 Jun 2010 10:17:47 -0700 + vyatta-bash (3.2-4-vyatta-1) unstable; urgency=low * Don't remove vbash from /etc/shells during upgrade |