[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.2+dfsg-10-28-g082f142

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=082f142

The following commit has been merged in the experimental branch:
commit 082f142b168330ffb9789ad541a13bfa93269252
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Mar 12 20:33:59 2013 -0300

    Refreshed patch QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
---
 debian/changelog                                   |    1 +
 ..._assistant_segfault_on_start_with_gcc_4.7.patch |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed3ea05..d6ac602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ qt4-x11 (4:4.8.4+dfsg-1) UNRELEASED; urgency=low
     - 94_armv6_uname_entry.diff
     - powerpcspe.diff
     - sh.diff
+    - QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
     - qt-multiarch-plugin-path-compat.diff
   * Update symbols
 
diff --git a/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch b/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
index 86ac003..bdb555d 100644
--- a/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
+++ b/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
@@ -8,9 +8,9 @@ Bug-Debian: http://bugs.debian.org/679874
 Forwarded: not-needed
 Last-Update: 2012-06-20
 
---- qt4-x11-4.8.2.orig/tools/assistant/tools/assistant/mainwindow.cpp
-+++ qt4-x11-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp
-@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
+--- a/tools/assistant/tools/assistant/mainwindow.cpp
++++ b/tools/assistant/tools/assistant/mainwindow.cpp
+@@ -945,8 +945,7 @@ void MainWindow::updateApplicationFont()
      if (helpEngine.usesAppFont())
          font = helpEngine.appFont();
  

-- 
Qt 4 packaging