Branches for Maverick

Author: Micah Gersten
Revision Date: 2010-08-25 17:07:03 UTC

* New upstream release (LP: #553269)
  + Drop patches applied upstream:
    - drop debian/patches/service-id_fix.patch
    - drop debian/patches/ffmpegthumbnailer-2.0.patch
    - drop debian/patches/autoreconf_-fi.patch
  + Refresh patch due to upstream changes
    - update debian/patches/const_char_conversion.patch

* Merge from debian unstable. Remaining changes:
  - debian/control:
    + Don't depend on libmozjs-dev
    + Add OR depends on abrowser
  - debian/rules: Disable js support
  - fix LP: #569763 - mediatomb allows anyone to browse and export the whole
    filesystem