-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Thomas, Jonathan Thomas, Tarun Kumar Mall, Philip Muškovac, Stéphane Graber, James Hunt
-
Date:
2011-06-01 02:09:54 UTC
-
mfrom:
(0.1.21 sid)
-
Revision ID:
james.westby@ubuntu.com-20110601020954-id2t0x9rwxwrmjn2
Tags: 4:4.6.3-1ubuntu1
[ Jonathan Thomas ]
* Merge with Debian Unstable, remaining changes:
- Add kdebase-workspace-wallpapers.{links, install}
- Add kdebase-workspace-data.links
- kdebase-workspace-data.install: don't add wallpapers that are in
kdebase-workspace-wallpapers.install
- Add kdm.{links, upstart}
- kdm.logrotate: rotate 2 -> rotate 7
- Make kdm work with upstart in kdm.prerm, kdm.postrm, kdm.postinst
- debian/control:
- don't build against libggadget-1.0-dev, libggadget-qt-1.0-dev
(they are in Universe)
- Build against libbost1.46-dev instead of libboost-dev
- Add libxml2-dev, libpolkit-qt-1-dev to build-deps
- Add python-kde4, python-sip, python-qt4 to build-dependencies
- Keep bumped our replaces/breaks
- plasma-netbook replaces plasma-widgets-workspace (<= 4:4.5.2-1ubuntu1)
- kdebase-workspace-bin suggests plasma-scriptengines instead of
recommend
- kdebase-workspace-data depends on oxygen-cursor-theme instead of oxygencursors
- Keep kdebase-workspace-wallpapers
- plasma-dataengines-workspace replaces plasma-widget-workspace (<= 4:4.5.2-1ubuntu1)
- plasma-widgets-workspace depends on akonadi-server and kdepim-runtime
- plasma-scriptengines not depends on plasma-scriptengine-googlegadgets
- plasma-scriptengine-ruby depends on libkde4-ruby
- Don't build plasma-scriptengine-googlegadgets
- freespacenotifier replaces kdebase-workspace-data (<= 4:4.5.2-1ubuntu1)
and kdebase-workspace-bin (<= 4:4.5.2-1ubuntu1)
- kinfocenter replaces kdebase-workspace-bin and systemsettings
- libplasmagenericshell4 replaces plasma-widgets-workspace (<= 4:4.5.2-1ubuntu1)
- debian/patches:
- Use 07_kdmrc_defaults_kubuntu.diff instead of 07_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
* Try a polkit-kde-1 | policykit-gnome-1 or-dependency again to see if policykit-1-gnome
is a suitable policykit solution a year later.
[ Tarun Kumar Mall ]
* New uptream release
* Bumped kde-sc-dev-latest version to 4.6.3
* Removed patches kubuntu_120_ksysguard_sensors.diff and
kubuntu_121_kdm_halt_cmd.diff, applied upstream
* Refreshed kubuntu_122_akonadi_calendar_dataengine.diff
[ Philip Muškovac ]
* drop kubuntu_123_effectframe_glflush.diff, applied upstream
* Refresh symbol files
[ Stéphane Graber ]
* Updated Vcs fields to point to kubuntu-uploaders instead of
kubuntu-members
[ James Hunt ]
* Updated kdm.conf to fix kdm in single user mode (LP: #436936)