-
Committer:
Bazaar Package Importer
-
Author(s):
Felix Geyer
-
Date:
2010-05-13 12:24:49 UTC
-
mfrom:
(1.1.20 upstream)
-
Revision ID:
james.westby@ubuntu.com-20100513122449-krjybyi5lk5nejll
Tags: 1:2.1.0~svn1112278beta4-1ubuntu1
* Merge from Debian unstable (LP: #579884), remaining changes:
- debian/control: Recommend firefox instead of iceweasel to have it look
like (konqueror | firefox); on default Ubuntu kile will then no longer
install konqueror. (LP: #452079)
- debain/control: Don't suggest kile-i18n
- debian/kile-doc.install: Install to /usr/share/doc/kde/HTML
* Remove revert-rev1086758.diff, replaced by
00_root_document_not_detected_kde_bug_233667.diff