Bug#32877: Patch: add merge commands

Attached patch (for dpkg-1.15.8.10) adds '--conf-merge-cmd' command line option, which adds user's favorite configuration files merging helper to the menu. Usage example: # dpkg --conf-merge-cmd='V;Diff/Merge versions with VIM;vim -d %O %N' install package.deb or user can drop a file in /et

Bug#611479: pyicqt: fails to start service

If i remove '-d' and add '-D' to command line, output contains the following: === Upgrading your XDB structure to use hashed directories for speed... Need to move notes_to_myself to /var/lib/pyicqt2/icq.xxx.ru/no/notes_to_myself but the latter exists! === So, removing the file /var/lib/pyicq