Comment 8 for bug 164815

The merge is OK as it is, but this is how I'd write the changelog entry (you need to do line wrapping)
  * Merged new upstream release from debian-multimedia.org. (LP: #164815), remaining Ubuntu changes:
    - debian/rules, debian/qdvdauthor.desktop, debian/qdvdauthor.install: install .desktop file + icons
    - debian/qslideshow.1, debian/qdvdauthor.1, debian/manpages, debian/qplayer.1: Added manpages.
    - debian/rules: Build with --qt-dir=/usr/share/qt3 --with-qt-lib=qt-mt --with-xine-support.
    - debian/control:
      - Added homepage field to debian/control.
      - Add netpbm, sox, lame, vorbis-tools, videotrans as Dependencies,
    - debian/patches/00list: don't apply -01_configure.dpatch because:
      - The QTDIR issue is now avoiced by passing the --qt-dir parameter to configure.
      - The make lines are edited out, so qplayer and qslideshow are not built. (The Ubuntu version builds them.)
    - debian/source.lintian-overrides: add lintian overrides for source-contains-CVS-dir
  * debian/control: drop -dbg package, we have -dbgsym packages now.

Note how I mentioned each file you changed and why it was changed?

What about
    - debian/source.lintian-overrides: add lintian overrides for source-contains-CVS-dir
- is it necessary?

Can some of these changes be passed back to the debian multimedia team?