~ubuntu-branches/ubuntu/maverick/kdemultimedia/maverick-proposed

Viewing all changes in revision 75.

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-11-14 02:33:52 UTC
  • mfrom: (1.2.33 upstream) (2.1.8 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091114023352-j6eo869z2acoe1wq
Tags: 4:4.3.3-0ubuntu1
* New upstream release
  - Remove duplicate line in dragonplayer.install
    (usr/share/kde4/config/dragonplayerrc)
  - Remove Kubuntu_04_qt_phonon.diff no longer need
  - Remove kscd-play-audiocd.desktop since is in kscd/ sources directory
  - Add usr/share/kde4/apps/profiles/kscd.profile.xml in kscd.install and
    remove not-installed file, it disappeared from kdelirc around 4.3.2
    and will be shipped only in kscd, add replaces
* Merge with Debian testing, remaining changes:
  - In debian folder keep dolphin-open-audiocd.desktop
    (add in kdemultimedia-kio-plugins.install)
  - Add KUBUNTU-DEBIAN-DIFFERENCES
  - Keep Kubuntu docs path
  - debian/kdemultimedia-dev.install:
    - Keep usr/share/dbus-1/interfaces/org.kde.juk.collection.xml instead in
      juk.install as Debian has done
  - debian/control:  
    - Build against libphonon-dev 4.6.0~beta1
    - Build-Depend on libtag-extras-dev to make juk read MP4 tags and add
      kubuntu_06_juk_read_mp4.diff for that
    - Keep our -kde4 conflicts/replaces

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: