Comment 6 for bug 320045

Unfortunately this merge isn't complete. Since it is a merge, the previous changelog entries from the previous merges, and any other Ubuntu changelog entries for this package need to be kept. It is also a good idea to mention in the changelog entry that you create, that this is a merge, and the changes that are being kept in the Ubuntu package, compared to the Debian package. I suggest you have a read of http://wiki.ubuntu.com/Merging as a starting point. I am pretty sure there are more useful documents on the wiki about merging, however I don't have the URLs to hand at the moment.

Hope the above helps you.