~ubuntu-branches/ubuntu/natty/kdebase-workspace/natty-proposed

* Merge from Debian Unstable. Remaining Ubuntu changes:
* Multiple files:
  - /kde/ instead of /kde4/ in doc path
* Debian/control
  - Directly build-depend on libboost1.42-dev instead of libboost-dev
  - Build-depend on libsensors4-dev instead of libsensors-dev because it is
    in Universe
  - Add python-sip, python-qt4, and python-kde4 to build-depends 
  - Add libqt4-webkit-dev to build-depends because it's been split out of
    the base qt4-x11 package in 4.7
  - Build-depend on libpolkit-qt-1-dev for PolicyKit support
  - Build-depend on libdbusmenu-qt-dev (>= 0.3.0) for dbusmenu support
  - Build-depend on sharutils for uuendcode/decode support
  - Drop build-deps on libggadget-1.0-dev, libggadget-qt-1.0-dev, and
    libgps-dev since they are in universe
  - Use Kubuntu Vcs-* instead of Debian
  - Bump kde-window-manager Replaces kdebase-workspace-bin version to 4.4.80
    due to moving kwin-tabbox settings files to kde-window-manager
  - Bump plasma-desktop Replaces plasma-widgets-workspace version to 4.4.80
    due to kickoff applet and desktop containment files being mistakenly
    placed in p-w-w in Lucid
  - Drop kdebase-workspace-bin depends on kaboom (Debian KDE3 - KDE4
    settings migration tool)
  - Move kdebase-workspace-bin Recommends plasma-scriptengines to suggests
  - Add kdebase-workspace-wallpapers package for extra wallpapers that don't
    fit on the CD
  - Add plasma-widgets-workspace Depends on akonadi-server and
    kdepim-runtime
  - Drop plasma-scriptengines Depends on plasma-scriptengine-googlegadgets
  - Add plasma-scriptengine-ruby depends on libkde4-ruby
  - Comment out plasma-scriptengine-googlegadgets (needs Universe build-dep)
  - kde-window-manager Conflict/Replace kwin-style-aurorae
* debian/kdebase-workspace-bin.install
  - Add usr/bin/kwrited since we haven't libutempter-dev in build-dep to
    build kwrited as a kded module and move kwrited.desktop to autostart
* Add debian/kdm-ethias-theme/ for Kubuntu default theme
* Add debian/kdm.links to support Ethias theme in kdm    
* Replace debian/kdm.init with debian/kdm.upstart
* debian/kdm.logrotate:
  - Only keep two days of logs to prevent excessive disk usage
* debian/kdm.postinst:
  - Remove sysvinit start logic and start kdm || true using upstart
* debian/kdm.postrm:
  - On purge remove /etc/init/kdm.conf instead of the sysv init script
* debian/kdm.prerm:
  - Stop using upstart instead of sysvinit
* Move non-default kdm themes from debian/kdm.install to debian/
  kdebase-workspace-wallpapers.install
* Add debian/kdebase-workspace-wallpapers.links
* Remove debian/klipper.postinst (only needed for KDE3/4 transition)
* Add kcheckpass.pam and kscreensaver.pam (LP #278842)
* debian/plasma-dataengines-workspace.install:
  - Drop usr/lib/kde4/plasma-geolocation-gps.so and
    usr/share/kde4/services/plasma-geolocation-gps.desktop because we do
    not build against gpsd
* Add usr/share/autostart/plasma-netbook.desktop to debian/
  plasma-netbook.install to support autostart with just plasma-netbook
  installed
* debian/plasma-scriptengine-python.install:
  - Install for python2.6 instead of python2.5
  - Don't install .pyc files
* debian/rules:
  - DEB_FIXPERMS_EXCLUDE := usr/bin/kwrited
  - Remove Ethias files in clean target
  - Install Ethias kdm theme
* debian/patches (Debian):
  - Use 07_kdmrc_defaults_kubuntu.diff instead of 07_kdmrc_defaults.diff
  - Disable 12_be_better_at_honouring_user_kdm_theming.diff
  - Disable 20_use_dejavu_as_default_font.diff Kubuntu - system default
  - Disable 26_run_kaboom_when_starting_kde.diff
  - Disable 97_fix_target_link_libraries.diff
* Update debian/not-installed
* Document changes from Debian in debian/KUBUNTU-DEBIAN-DIFFERENCES
* debian/patches (Kubuntu):
  - Drop kubuntu_01_fix_dateandtimekcm.diff, incorporated upstream
  - Keep kubuntu_02_screensaver_restricted_install.diff and
    kubuntu_03_kickoff_configchanged.diff
  - Drop kubuntu_04_fix_kickoff_model_loading.diff, incorporated upstream
  - Keep kubuntu_11_fix_root_only_kcms.diff,
    kubuntu_12_kubuntu_homepage.diff, kubuntu_13_startkde_set_country.diff,
    kubuntu_19_always_show_kickoff_subtext.diff,
    kubuntu_34_kdm_plymouth_transition.diff,
    kubuntu_52_gtk2_engines_qtcurve_config.diff,
    kubuntu_63_ksplash_fix.diff, kubuntu_72_remove_startkde_cruft.diff,
    kubuntu_80_fix_includes.diff,
    kubuntu_93_fix_username_icon_alignment.diff,
    kubuntu_101_brightness_fn_keys_and_osd.diff,
    kubuntu_102_plasma_netbook_no_autostart.diff, kubuntu_103_kdm_theme.diff
    kubuntu_105_netbook_favourites.diff, kubuntu_106_netbook_layout.diff,
    kubuntu_107_intel_compositing_fix.diff, kubuntu_109_ksplash_netbook.diff
 - Temporarily disable kubuntu_98_dbusmenu.diff since it's causing configure
   to fail and it will be upstream for kde 4.5
 - Drop kubuntu_110_fix_appswitch.diff, incorporated upstream
 - Drop kubuntu_111_netbook_f4_fix.diff, incorporated upstream
 - Drop kubuntu_112_kdm_multiscreen_fix.diff, incorporated upstream
 - Drop kubuntu_113_kmenuedit_folder_move_fix.diff, incorporated upstream
 - Keep kubuntu_114_respect_screensaver_settings.diff
 - Drop kubuntu_115_read_compositing_settings.diff, incorporated upstream
 - Drop kubuntu_116_oxygen_cursor_fix.diff, incorporated upstream
 - Drop kubuntu_117_randr_fix_revert.diff, incorporated upstream
 - Drop kubuntu_118_netbook_activitybar.diff, incorporated upstream
 - Drop kubuntu_119_powerdevil_fix_suspend_twice.diff, incorporated upstream
 - Drop kubuntu_120_powerdevil_reset_status_after_idle.diff, incorporated
   upstream
 - Update CVE-2010-0436_fix_kdm_local_exploit.diff, partially incorporated
   upstream