-
Committer:
Bazaar Package Importer
-
Author(s):
Alessandro Ghersi
-
Date:
2010-05-19 21:09:38 UTC
-
mfrom:
(1.2.42 upstream)
(3.1.8 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20100519210938-g94qt97lywsy98gm
Tags: 4:4.4.3-1ubuntu1
* Merge with Debian unstable, remaining changes:
- Don't ship knetworkconf, it is utterly busted
- kdeadmin doesn't depend on knetworkconf
- kde-config-cron conflicts/replaces on kcron (<< 4:4.4.60)
- system-config-printer-kde depends on system-printer-common
- system-config-printer-kde doesn't depend on python-cupsutils
- kdeadmin-dbg depends on kdeadmin
- Keep Kubuntu docs path in kde/HTML
- Don't keep kpackage.sgml