[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-1-26-g9c23bf1

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 9c23bf1ff80872b7ca85b53ad344dd368a611937
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Jan 20 11:48:55 2010 +0100

    lintian--
---
 debian/qt4-demos.lintian-overrides |   14 ++++++++++----
 debian/qt4-doc-html.doc-base       |    2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/qt4-demos.lintian-overrides b/debian/qt4-demos.lintian-overrides
index 60dadda..4392d9f 100644
--- a/debian/qt4-demos.lintian-overrides
+++ b/debian/qt4-demos.lintian-overrides
@@ -37,7 +37,7 @@ qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/mainwindow/qt.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/mainwindow/titlebarCenter.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/mainwindow/titlebarLeft.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/mainwindow/titlebarRight.png
-qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/mediaplayer/images/screen.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/qmediaplayer/images/screen.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/qtdemo/images/demobg.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/qtdemo/images/qtlogo_small.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/demos/qtdemo/images/trolltech-logo.png
@@ -386,6 +386,12 @@ qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedasteroi
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedcanvas/butterfly.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedcanvas/qt-trans.xpm
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/portedcanvas/qtlogo.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/weatheranchorlayout/images/5days.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/weatheranchorlayout/images/details.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/weatheranchorlayout/images/place.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/weatheranchorlayout/images/tabbar.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/weatheranchorlayout/images/title.jpg
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/graphicsview/weatheranchorlayout/images/weather-few-clouds.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/remotecontrol/enter.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/browse.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/help/simpletextviewer/documentation/images/fadedfilemenu.png
@@ -422,9 +428,9 @@ qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/ope
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/paste.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/mainwindows/sdi/images/save.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/multitouch/pinchzoom/images/cheese.jpg
-qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/ftp/images/cdtoparent.png
-qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/ftp/images/dir.png
-qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/ftp/images/file.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/qftp/images/cdtoparent.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/qftp/images/dir.png
+qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/qftp/images/file.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/securesocketclient/encrypted.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/1downarrow.png
 qt4-demos: image-file-in-usr-lib usr/lib/qt4/examples/network/torrent/icons/1uparrow.png
diff --git a/debian/qt4-doc-html.doc-base b/debian/qt4-doc-html.doc-base
index 2a96c20..4a9c328 100644
--- a/debian/qt4-doc-html.doc-base
+++ b/debian/qt4-doc-html.doc-base
@@ -4,7 +4,7 @@ Author: Nokia Corporation
 Abstract: Qt is a cross-platform C++ application framework.  Qt's
  primary feature is its rich set of widgets that provide standard GUI
  functionality.
-Section: Applications/programming
+Section: Programming/C++
 
 Format: HTML
 Index: /usr/share/doc/qt4-doc-html/html/index.html

-- 
Qt 4 Debian packaging