Branches for Intrepid

Author: Matthias Klose
Revision Date: 2008-06-26 00:42:24 UTC

* Merge with Debian; remaining changes:
  - debian/wodim.links: added symlink to /usr/bin/cdrecord
  - debian/genisoimage.links: added symlink to /usr/bin/mkisofs
  - debian/icedax.links: added symlink to /usr/bin/cdda2wav
  - debian/control:
    - added Provides: cdrecord to binary package wodim
    - added Provides: mkisofs to binary package genisoimage
    - added Provides: cdda2wav to binary package icedax
    - removed all version strings from conflicts/replaces
      in wodim, genisoimage and icedax for the respective
      cdrtools binary pkg names
  - debian/wodim.preinst: add "7a4383a7c0995736dee9d646b0724d08" to the
    md5sums of unchanged config files (that is the dapper one).
  - introduce alternatives system for the scripts and manpages
    "cdda2mp3" and "cdda2ogg", in order to avoid file conflicts between
    the cdda2wav package from multiverse with icedax from main.
  - no longer provide the dummy packages 'cdrecord', 'mkisofs' and
    'cdda2wav', since we now have cdrtools in multiverse