[SCM] KDE Base Applications module packaging branch, kde4.8, updated. debian/4.8.3-1-8-g4823a60

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase.git;a=commitdiff;h=4823a60

The following commit has been merged in the kde4.8 branch:
commit 4823a6032e93ab37fbe8fc6d8f79f78386a8bb18
Author: Pino Toscano <pino at debian.org>
Date:   Wed Jun 6 16:39:14 2012 +0200

    move files of the konqueror documentation from kde-baseapps-data to konqueror
---
 debian/changelog                 |    4 ++++
 debian/control                   |    2 ++
 debian/kde-baseapps-data.install |    3 ---
 debian/konqueror.install         |    3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 705e11e..2dd0576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ kde-baseapps (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Bump kde-sc-dev-latest build dependency to version 4:4.8.4.
   * Update installed files.
 
+  [ Pino Toscano ]
+  * Move files of the konqueror documentation from kde-baseapps-data to
+    konqueror itself.
+
  -- Eshat Cakar <info at eshat.de>  Tue, 05 Jun 2012 17:17:02 +0200
 
 kde-baseapps (4:4.8.3-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index c61e844..b133ac2 100644
--- a/debian/control
+++ b/debian/control
@@ -133,6 +133,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, kde-baseapps-data (= ${source:Versi
  kde-baseapps-bin (= ${binary:Version}), install-info
 Suggests: konq-plugins (>= 4:4.1~)
 Recommends: konqueror-nsplugins (= ${binary:Version}), dolphin, kfind
+Breaks: kde-baseapps-data (<< 4:4.8.4)
+Replaces: kde-baseapps-data (<< 4:4.8.4)
 Description: advanced file manager, web browser and document viewer
  Konqueror is the KDE web browser and advanced file manager.
  .
diff --git a/debian/kde-baseapps-data.install b/debian/kde-baseapps-data.install
index 0a7f1d5..3301dc0 100644
--- a/debian/kde-baseapps-data.install
+++ b/debian/kde-baseapps-data.install
@@ -1,6 +1,3 @@
-usr/share/doc/kde/HTML/en/konqueror/format-font-size-less.png
-usr/share/doc/kde/HTML/en/konqueror/format-font-size-more.png
-usr/share/doc/kde/HTML/en/konqueror/viewproperties-dialog.png
 usr/share/kde4/apps/kcmcss/template.css
 usr/share/kde4/apps/kcontrol/pics/onlyone.png
 usr/share/kde4/apps/kcontrol/pics/overlapping.png
diff --git a/debian/konqueror.install b/debian/konqueror.install
index 737143e..f25ca88 100644
--- a/debian/konqueror.install
+++ b/debian/konqueror.install
@@ -37,6 +37,8 @@ usr/share/doc/kde/HTML/en/konqueror/dragdrop.png
 usr/share/doc/kde/HTML/en/konqueror/faq.docbook
 usr/share/doc/kde/HTML/en/konqueror/filemanager.docbook
 usr/share/doc/kde/HTML/en/konqueror/folders.png
+usr/share/doc/kde/HTML/en/konqueror/format-font-size-less.png
+usr/share/doc/kde/HTML/en/konqueror/format-font-size-more.png
 usr/share/doc/kde/HTML/en/konqueror/index.cache.bz2
 usr/share/doc/kde/HTML/en/konqueror/index.docbook
 usr/share/doc/kde/HTML/en/konqueror/introduction.docbook
@@ -53,6 +55,7 @@ usr/share/doc/kde/HTML/en/konqueror/shortcut2.png
 usr/share/doc/kde/HTML/en/konqueror/sidebar.docbook
 usr/share/doc/kde/HTML/en/konqueror/thumbnails.png
 usr/share/doc/kde/HTML/en/konqueror/view-extensions.docbook
+usr/share/doc/kde/HTML/en/konqueror/viewproperties-dialog.png
 usr/share/icons/hicolor/128x128/apps/konqueror.png
 usr/share/icons/hicolor/16x16/apps/konqueror.png
 usr/share/icons/hicolor/22x22/apps/konqueror.png

-- 
KDE Base Applications module packaging