[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-73-g0afb130

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 6bac9432930c4bfe28c6885f055294a38223a034
Author: Fathi Boudra <fabo at kde.org>
Date:   Mon Feb 15 15:45:48 2010 +0100

    Refresh patches.
---
 debian/patches/0180-window-role.diff               |    2 +-
 .../patches/15_fix_qmake_makefile_generation.diff  |    2 +-
 .../18_enable_qt3support_qtwebkit_debug_info.diff  |    2 +-
 debian/patches/92_armel_gcc43_valist_compat.diff   |    4 ++--
 debian/patches/96_powerpc_no_gc_sections.diff      |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index ef4b5a4..5467826 100644
--- a/debian/patches/0180-window-role.diff
+++ b/debian/patches/0180-window-role.diff
@@ -52,7 +52,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
                                      Sender *sender);
 --- a/src/gui/kernel/qwidget_p.h
 +++ b/src/gui/kernel/qwidget_p.h
-@@ -691,6 +691,7 @@ public:
+@@ -693,6 +693,7 @@ public:
      static QWidget *keyboardGrabber;
  
      void setWindowRole();
diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff
index b31b7c7..ef1bbb7 100644
--- a/debian/patches/15_fix_qmake_makefile_generation.diff
+++ b/debian/patches/15_fix_qmake_makefile_generation.diff
@@ -1,6 +1,6 @@
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -2383,7 +2383,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2396,7 +2396,7 @@ MakefileGenerator::writeSubTargets(QText
  
          QString mkfile = subtarget->makefile;
          if(!in_directory.isEmpty())
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index 5aed855..44cdb54 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -5,7 +5,7 @@ This patch enable them.
 
 --- a/src/3rdparty/webkit/WebCore/WebCore.pro
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -3389,8 +3389,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -3392,8 +3392,6 @@ HEADERS += $$WEBKIT_API_HEADERS
  CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
      # start with 4.5
      # Remove the following 2 lines if you want debug information in WebCore
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index e690d5c..acd3e28 100644
--- a/debian/patches/92_armel_gcc43_valist_compat.diff
+++ b/debian/patches/92_armel_gcc43_valist_compat.diff
@@ -15,7 +15,7 @@ Forward: not-needed
 
 --- a/src/corelib/tools/qstring.cpp
 +++ b/src/corelib/tools/qstring.cpp
-@@ -5289,6 +5289,11 @@
+@@ -5289,6 +5289,11 @@ QString &QString::vsprintf(const char* c
      return *this;
  }
  
@@ -29,7 +29,7 @@ Forward: not-needed
      base, which is 10 by default and must be between 2 and 36, or 0.
 --- a/src/corelib/tools/qvsnprintf.cpp
 +++ b/src/corelib/tools/qvsnprintf.cpp
-@@ -104,6 +104,12 @@
+@@ -104,6 +104,12 @@ int qvsnprintf(char *str, size_t n, cons
  
  #endif
  
diff --git a/debian/patches/96_powerpc_no_gc_sections.diff b/debian/patches/96_powerpc_no_gc_sections.diff
index 6e21496..613af8a 100644
--- a/debian/patches/96_powerpc_no_gc_sections.diff
+++ b/debian/patches/96_powerpc_no_gc_sections.diff
@@ -5,7 +5,7 @@ Author: Steve Langasek <steve.langasek at ubuntu.com>
 
 --- a/src/3rdparty/webkit/WebCore/WebCore.pro
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -60,7 +60,7 @@ unix {
+@@ -63,7 +63,7 @@ unix {
  }
  
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 

-- 
Qt 4 Debian packaging