-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Riddell
-
Date:
2009-05-05 13:55:26 UTC
-
mfrom:
(0.1.5 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090505135526-ft8ym3kz8qg1mjhj
Tags: 4:4.2.2-1ubuntu1
* Merge with Debian, reamaining changes:
- Keep our -kde4 replaces/conflicts
- Do not re-add optional, unsatisfiable kdesktop dependency for libkonq5
- Add newline to the end of kwrite.lintian-overrides
- kubuntu_04_hide_kfind.diff, access though dolphin
- kubuntu_05_konsole_colour_scheme.diff, much easier on the eyes
- kubuntu_06_simple_aboutpage.diff, treat konqeror as a web browser
- kubuntu_09_trash_kcm_in_dolphin.diff, from trunk
- kubuntu_10_konq_scans_nsplugins_at_startup.diff, scan for new plugins
- kubuntu_11_svn954343_dolphin_prefix.diff, from trunk
- kubuntu_12_folderview_retry.diff, fixes folderview on live CD