Merge lp:~yofel/kde-baseapps/4.5.80ubuntu2 into lp:~kubuntu-packagers/kubuntu-packaging/kde-baseapps

[Philip Muškovac]

Fixes:

Preparing to replace konqueror 4:4.5.3-0ubuntu1~maverick1~ppa1 (using .../konqueror_4%3a4.5.80-0ubuntu1~maverick1~ppa1_amd64.deb) ...
Unpacking replacement konqueror ...
dpkg: error processing /var/cache/apt/archives/konqueror_4%3a4.5.80-0ubuntu1~maverick1~ppa1_amd64.deb (--unpack):
 trying to overwrite '/usr/lib/kde4/konqsidebar_places.so', which is also in package libkonqsidebarplugin4a 4:4.5.3-0ubuntu1~maverick1~ppa1

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-29 17:14:44 +0000
+++ debian/changelog	2010-12-01 16:04:41 +0000
@@ -1,3 +1,9 @@
+kdebase (4:4.5.80-0ubuntu2) natty; urgency=low
+
+  * konqueror replaces libkonqsidebarplugin4a (<< 4:4.5.80) 
+
+ -- Philip Muskovac <[e-mail]>  Wed, 01 Dec 2010 16:53:09 +0100
+
 kdebase (4:4.5.80-0ubuntu1) natty; urgency=low
 
   * New upstream beta release

=== modified file 'debian/control'
--- debian/control	2010-11-04 16:29:20 +0000
+++ debian/control	2010-12-01 16:04:41 +0000
@@ -104,7 +104,7 @@
 Provides: info-browser, man-browser, www-browser
 Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-data (= ${source:Version}),
  kdebase-bin (= ${binary:Version}), install-info
-Replaces: dolphin (<< 4:4.1.80), libkonqsidebarplugin4a (<< 4:4.5.2-0ubuntu2)
+Replaces: dolphin (<< 4:4.1.80), libkonqsidebarplugin4a (<< 4:4.5.80)
 Suggests: konq-plugins (>= 4:4.1~)
 Recommends: konqueror-nsplugins (= ${binary:Version}), dolphin
 Description:  advanced file manager, web browser and document viewer