-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Thomas
-
Date:
2009-05-15 23:28:30 UTC
-
mfrom:
(0.1.1 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090515232830-ufjpy8rgx5ps2y5v
Tags: 4:4.2.2-1ubuntu1
* Merge with Debian unstable, LP: #390251 , remaining changes:
- Don't include .svn directories
- Add conflicts on past package names
- Keep transitional dummy package for konqueror-plugins
- Add konq-plugins.install for the above
- Keep watch file
- Set KUBUNTU_DESKTOP_POT
* Drop KUBUNTU-DEBIAN-DIFFERENCES, all changes are obvious/can be contained
to debian/changelog
* Bump compat to 7 for the use of pkg-kde-tools
* Drop cmake build-depend since we get it via kdelibs5-dev, but only in
versions (>= 4:4.2.85) so bump libkonq5-dev build-depend ver accordingly