~ubuntu-branches/ubuntu/karmic/xine-lib/karmic

Viewing all changes in revision 61.

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-27 21:46:12 UTC
  • mfrom: (0.1.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20090127214612-vmyahcqfcaq5ys6m
Tags: 1.1.16.1-2ubuntu1
* merge with debian.
* drop nearly all ubuntu local changes:
  - 01_bits-per-sample.dpatch resolved upstream in 
    src/combined/ffmpeg/ffmpeg_decoder.h via a #define
  - 02_decode_audio.dpatch as well
  - 03_magick-wand.dpatch does not seem necessary right now.
    Build fine without, and package ships 2 very similar .pc files
  - 04_magick-wand-bool.dpatch does also seem unnecessary. besides
    faking prototypes is not the right solution for a missing #include
    ( if someone disagrees here, please let's discuss this in detail
      in a debian bugreport. The merge is painfuly already like it is 
      right now )
  - 05_am-maintainer-mode.dpatch & 06_autoreconf.dpatch:
    unnecessary
* merged into the debian branch:
  - debian/rules cleanup
* applied (inline) ino the ubuntu package:
  - debian/patches/10_translation-fixes.dpatch
    patches src/xine-engine/load_plugins.c
    Patch rejected upstream, but needed in ubuntu because of broken
    translations in ubuntu language packs. This patch can be dropped
    after the next language pack update.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: