[Bug 440683] Re: Samba server upgrade crashed

2009-10-02 Thread doug
** Attachment added: Dependencies.txt http://launchpadlibrarian.net/32870447/Dependencies.txt ** Attachment added: DpkgTerminalLog.txt http://launchpadlibrarian.net/32870448/DpkgTerminalLog.txt -- Samba server upgrade crashed https://bugs.launchpad.net/bugs/440683 You received this bug

[Bug 440683] Re: Samba server upgrade crashed

2009-10-02 Thread Chuck Short
Relevant error: Setting up samba-common (2:3.3.2-1ubuntu3.2) ... Merging changes into the new version Conflicts found! Please edit `/etc/samba/smb.conf' and sort them out manually. The file `/etc/samba/smb.conf.ucf-new' has a record of the failed merge of the configuration file. dpkg: error