[SCM] filelight Debian packaging branch, master, updated. upstream/1.9.rc3-19-g5e98a3b

[Didier Raboud]

The following commit has been merged in the master branch:
commit a50ab2c697a8012fe38ae6f84f6091dc6c18c151
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Mon Mar 14 14:30:24 2011 +0100

    Add gcc4.5.patch to fix FTBFS (Closes: #564987).
    
    Signed-off-by: Didier Raboud <odyx at debian.org>
---
 debian/changelog            |    4 ++++
 debian/patches/gcc4.5.patch |   27 +++++++++++++++++++++++++++
 debian/patches/series       |    1 +
 3 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f630673..e33ea4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 filelight (1.9~rc3-3) UNRELEASED; urgency=low
 
+  [ Didier Raboud ]
   * Updated standards version to 3.9.1, no changes needed.
   * Change my address to @d.o.
 
+  [ Raúl Sánchez Siles ]
+  * Add gcc4.5.patch to fix FTBFS (Closes: #564987).
+
  -- Didier Raboud <odyx at debian.org>  Mon, 14 Mar 2011 12:23:39 +0100
 
 filelight (1.9~rc3-2) unstable; urgency=low
diff --git a/debian/patches/gcc4.5.patch b/debian/patches/gcc4.5.patch
new file mode 100644
index 0000000..2508a62
--- /dev/null
+++ b/debian/patches/gcc4.5.patch
@@ -0,0 +1,27 @@
+Description: Fix gcc4.5 build failures
+ "for a function-style cast, remove the redundant '::KUrl'"
+Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
+Origin: vendor
+Last-Update: 2010-03-14
+--- a/src/app/mainWindow.cpp
++++ b/src/app/mainWindow.cpp
+@@ -222,7 +222,7 @@
+ 
+ inline bool MainWindow::slotScanPath(const QString &path)
+ {
+-    return slotScanUrl(KUrl::KUrl(path));
++    return slotScanUrl(KUrl(path));
+ }
+ 
+ bool MainWindow::slotScanUrl(const KUrl &url)
+--- a/src/part/radialMap/widget.cpp
++++ b/src/part/radialMap/widget.cpp
+@@ -64,7 +64,7 @@
+ KUrl
+ RadialMap::Widget::url(File const * const file) const
+ {
+-    return KUrl::KUrl(file ? file->fullPath() : m_tree->fullPath());
++    return KUrl(file ? file->fullPath() : m_tree->fullPath());
+ }
+ 
+ void
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0783804
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gcc4.5.patch

-- 
filelight Debian packaging