~ubuntu-branches/ubuntu/lucid/kdebase/lucid

* Merge with Debian testing remaining changes:
  - Keep our -kde4 replaces/conflicts
  - Do not add unsatisfiable kdesktop dependency for libkonq5
  - kubuntu_04_hide_kfind.diff
  - kubuntu_05_konsole_colour_scheme.diff
  - kubuntu_06_simple_aboutpage.diff
  - kubuntu_10_konq_scans_nsplugins_at_startup.diff
  - kubuntu_14_dolphin_preview_on.diff
  - kubuntu_15_fdo_notifications.diff
  - kubuntu_16_fdo_notifications.diff
  - kubuntu_17_abort_string.diff
  - kubuntu_18_fix_systemsettings_about_me.diff, LP: #390396
  - kubuntu_19_install_flash.diff
  - Add kdebase transitional package which depends on kdebase-apps
* New upstream release
  - Remove kubuntu_20_fix_dolphin_terminal_crash.diff, fixed upstream
  - Remove kubuntu_13_fix_phonon_include.diff, include file now exists