Comment 15 for bug 595450

Hmm so my point 2 is wrong(because I got confused seeing the diffs)

But point 1 is valid according to point number 5 on the wiki which states

Change the debian/changelog to note your work. Note which Ubuntu deltas are still valid and why invalid ones were dropped. Change the M-O-M e-mail address and name to yours. Make sure you keep old Ubuntu changelog entries.

xxxxx (vvv-1ubuntu1) maverick; urgency=low

  * Merge from debian unstable. Remaining changes:
    + Modified build-dep on libfoo to build on maverick.
    + Added .desktop file.

and point number 3 is valid as I find whitespaces in your debian/changelog in the diff as under:

-
+
 apt-cacher (1.5.4) unstable; urgency=low

Please delete those - and + and refresh the debdiff from ubuntu version please

Regards