[ Jonathan Kolberg ]
* New upstream beta release
  - Merge kde-workspace-data and kde-workspace-data-extras
  - drop kubuntu_active_fix_kwin_xrender_disable.diff (applyed upstream)
  - drop enable_kwinactive.diff (applyed upstream)
  - refresh 
    * enable_kwinactive.diff
    * kubuntu_upstart_session_events.diff

[ Jonathan Thomas ]
* New upstream beta release:
  - Update .install files
  - Update .symbols files
  - Bump libkdecoration4 Debian api, rename to libkdecoration4api1
  - Bump libkwineffects4 Debian api, rename to libkdwineffects4api4
* Merge with Debian Git, remaining changes:
  - Add kdm.{links, upstart}
  - Make kdm work with upstart in kdm.prerm, kdm.postrm, kdm.postinst
  - Add kde-window-manager-gles.install and libkwineffects1abi2-gles.install
  - Move non-default kdm and ksplash themes to the new package
    kde-workspace-data-extras.
  - kdm.logrotate: rotate 7 -> rotate 2 to help stop excess disk usage
  - debian/control:
    - don't build against libggadget-1.0-dev, libggadget-qt-1.0-dev
      (they are in Universe)
    - Build against libbost1.49-dev instead of libboost-dev
    - Keep bumped our replaces/breaks
    - kde-workspace-bin suggests plasma-scriptengines instead of
      recommend
    - kdebase-workspace-data depends on oxygen-cursor-theme instead of oxygencursors
    - Keep kdebase-workspace-wallpapers
    - plasma-widgets-workspace depends on akonadi-server and kdepim-runtime
    - plasma-scriptengines not depends on plasma-scriptengine-googlegadgets
    - Don't build plasma-scriptengine-googlegadgets
  - debian/patches:
    - Use kdmrc_defaults_kubuntu.diff instead of kdmrc_defaults.diff
    - Don't add be_better_at_honouring_user_kdm_theming
    - Don't add use_dejavu_as_default_font
    - Don't add fix_target_link_libraries
    - Keep our patches
  - kde-workspace-bin.install do not install remote-widgets-browser