[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.3-1-12-g0c11d44

Fathi Boudra fabo at alioth.debian.org
Sun Jun 12 16:46:06 UTC 2011 

The following commit has been merged in the experimental branch:
commit 0c11d44a325ca854532e04a233d70e219c1723ad
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jun 12 19:44:59 2011 +0300

    Remove  armv6_Add_support_for_ARMv7_atomic_operations.patch
    Include diffstat to patches
---
 debian/changelog                                   |    2 +
 debian/patches/01_debian_append_qt4_suffix.diff    |   27 ++
 ...cqt_sane_timestamp_for_nonexisting_headers.diff |    4 +
 .../patches/07_trust_dpkg-arch_over_uname-m.diff   |    4 +
 debian/patches/08_configure_quilt_compat.diff      |    4 +
 debian/patches/10_config_tests_fixes.diff          |    7 +
 debian/patches/11_build_translations.diff          |    6 +
 .../patches/12_add_nostrip_for_debug_packages.diff |    4 +
 .../patches/15_fix_qmake_makefile_generation.diff  |    4 +
 .../patches/16_hide_std_symbols_on_qtwebkit.diff   |    5 +
 .../18_enable_qt3support_qtwebkit_debug_info.diff  |    5 +
 debian/patches/20_install_qvfb.diff                |    4 +
 .../23_permit_plugins_built_with_future_qt.diff    |    4 +
 debian/patches/30_webkit_unaligned_access.diff     |    7 +
 debian/patches/40_alpha_ice.diff                   |    5 +
 debian/patches/41_disable_opengl_visibility.diff   |    4 +
 debian/patches/50_kfreebsd_Q_OS.diff               |    4 +
 debian/patches/51_kfreebsd_strnstr_build_fix.diff  |    5 +
 debian/patches/70_hppa_ldcw_fix.diff               |    4 +
 .../71_hppa_unaligned_access_fix_458133.diff       |    4 +
 debian/patches/80_hurd_max_path.diff               |    4 +
 debian/patches/92_armel_gcc43_valist_compat.diff   |    5 +
 debian/patches/94_armv6_uname_entry.diff           |    4 +
 debian/patches/96_webkit_no_gc_sections.diff       |    4 +
 .../99_hppa_bug561203_decrease_failure_rate.diff   |    4 +
 ...6_Add_support_for_ARMv7_atomic_operations.patch |  399 --------------------
 .../armv6_Include_explicitly_IT_instructions.patch |    4 +-
 .../buildable_appchooser_states_demos.patch        |    5 +
 debian/patches/kfreebsd_monotonic_clock.diff       |    4 +
 debian/patches/powerpc_designer_gstabs.diff        |    4 +
 debian/patches/powerpcspe.diff                     |    4 +
 debian/patches/qtdebug_syslog.patch                |    5 +
 debian/patches/series                              |    1 -
 debian/patches/sh.diff                             |    4 +
 34 files changed, 162 insertions(+), 402 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 149c1de..bca35e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qt4-x11 (4:4.8~alpha+tp-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Remove patches:
+    - armv6_Add_support_for_ARMv7_atomic_operations.patch - stolen upstream.
   * Update debian/rules:
     - remove -qt-gif configure option - removed upstream.
 
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index 3cc0ee8..f2c4c45 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -7,6 +7,33 @@ Description: Append a -qt4 suffix to some tools.
 Last-Update: 2011-03-03
 Forwarded: not-needed
 
+---
+ config.tests/unix/compile.test                    |    2 +-
+ config.tests/unix/doubleformat.test               |    2 +-
+ config.tests/unix/endian.test                     |    2 +-
+ config.tests/unix/ptrsize.test                    |    2 +-
+ config.tests/x11/notype.test                      |    2 +-
+ configure                                         |   12 ++++++------
+ demos/qtdemo/menumanager.cpp                      |    2 +-
+ mkspecs/common/linux.conf                         |    4 ++--
+ mkspecs/features/moc.prf                          |    2 +-
+ mkspecs/features/uic.prf                          |    2 +-
+ projects.pro                                      |    2 +-
+ qmake/Makefile.unix                               |    8 ++++----
+ src/tools/moc/moc.pro                             |    2 +-
+ src/tools/uic/uic.pro                             |    2 +-
+ tools/assistant/tools/assistant/assistant.pro     |    2 +-
+ tools/designer/src/designer/assistantclient.cpp   |    2 +-
+ tools/designer/src/designer/designer.pro          |    2 +-
+ tools/designer/src/lib/shared/qdesigner_utils.cpp |    2 +-
+ tools/linguist/linguist/linguist.pro              |    2 +-
+ tools/linguist/lrelease/lrelease.pro              |    2 +-
+ tools/linguist/lupdate/lupdate.pro                |    2 +-
+ tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp         |    2 +-
+ tools/qtconfig/qtconfig.pro                       |    2 +-
+ translations/translations.pro                     |    6 +++---
+ 24 files changed, 35 insertions(+), 35 deletions(-)
+
 --- a/config.tests/unix/compile.test
 +++ b/config.tests/unix/compile.test
 @@ -68,7 +68,7 @@ test -r Makefile && $MAKE distclean >/de
diff --git a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
index a60610e..3c4c5dd 100644
--- a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
+++ b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
@@ -9,6 +9,10 @@ qconfig.h does not exist when syncqt is run by ./configure. So instead of
 assigning a modification timestamp equal to the epoch (00:00 January 1, 1970
 GMT.) for the symlink, just use current time().
 
+---
+ bin/syncqt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/bin/syncqt
 +++ b/bin/syncqt
 @@ -831,7 +831,7 @@ foreach my $lib (@modules_to_sync) {
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index 01eb78f..d3f071c 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -2,6 +2,10 @@ author: Sune Vuorela
 qt-bugs@ issue : N180631
 Trolltech task ID : 181882
 
+---
+ configure |   45 ++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 44 insertions(+), 1 deletion(-)
+
 --- a/configure
 +++ b/configure
 @@ -168,7 +168,50 @@ linkerSupportsFlag()
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index ced8dc0..32744dd 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -1,6 +1,10 @@
 Avoid '.pc' directories created by quilt.
 It breaks qmake projects search.
 
+---
+ configure |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/configure
 +++ b/configure
 @@ -8889,7 +8889,7 @@ fi
diff --git a/debian/patches/10_config_tests_fixes.diff b/debian/patches/10_config_tests_fixes.diff
index 6a08a5a..2b3f93d 100644
--- a/debian/patches/10_config_tests_fixes.diff
+++ b/debian/patches/10_config_tests_fixes.diff
@@ -4,6 +4,13 @@ Description: Various config.test fixes.
 Author: Fathi Boudra <fabo at debian.org>
 Last-Update: 2010-05-24
 
+---
+ config.tests/unix/gstreamer/gstreamer.pro |    1 +
+ config.tests/unix/ibase/ibase.pro         |    2 +-
+ config.tests/unix/sqlite/sqlite.pro       |    1 +
+ src/sql/drivers/ibase/qsql_ibase.pri      |    2 +-
+ 4 files changed, 4 insertions(+), 2 deletions(-)
+
 --- a/config.tests/unix/ibase/ibase.pro
 +++ b/config.tests/unix/ibase/ibase.pro
 @@ -1,4 +1,4 @@
diff --git a/debian/patches/11_build_translations.diff b/debian/patches/11_build_translations.diff
index 66ceb54..ff0a712 100644
--- a/debian/patches/11_build_translations.diff
+++ b/debian/patches/11_build_translations.diff
@@ -3,6 +3,12 @@ author: Fathi Boudra <fabo at debian.org>
 translations fails to build under autobuilders.
 Use case: Qt sources comes from git and we need to build them.
 
+---
+ tools/assistant/translations/qt_help.pro      |   53 +++++++++
+ tools/assistant/translations/translations.pro |   54 +++++++++
+ tools/designer/translations/translations.pro  |  141 ++++++++++++++++++++++++++
+ 3 files changed, 248 insertions(+)
+
 --- /dev/null
 +++ b/tools/assistant/translations/qt_help.pro
 @@ -0,0 +1,53 @@
diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff
index e593598..6ffecc8 100644
--- a/debian/patches/12_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/12_add_nostrip_for_debug_packages.diff
@@ -4,6 +4,10 @@ Qt is built in release mode and strip files by default.
 Set CONFIG+=nostrip to avoid the stripping and
 let dh_strip do it to generate debug packages.
 
+---
+ configure |    2 ++
+ 1 file changed, 2 insertions(+)
+
 --- a/configure
 +++ b/configure
 @@ -674,6 +674,8 @@ mkdir -p "$outpath/config.tests"
diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff
index b4d5223..f5b226c 100644
--- a/debian/patches/15_fix_qmake_makefile_generation.diff
+++ b/debian/patches/15_fix_qmake_makefile_generation.diff
@@ -1,6 +1,10 @@
 Description: Fix qmake makefile generation - should not add double slashes to makefiles.
 Author: Sune Vuorela <debian at pusling.com>
 
+---
+ qmake/generators/makefile.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -2444,7 +2444,7 @@ MakefileGenerator::writeSubTargets(QText
diff --git a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
index b1e5e23..42d38e9 100644
--- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
+++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
@@ -2,6 +2,11 @@ Description: Don't make the std:: symbols in webkit public.
 Solution based on the work of Mike Hommey in the gtk webkit package.
 Author: Sune Vuorela <debian at pusling.com>
 
+---
+ src/3rdparty/webkit/WebKit.pri     |    1 +
+ src/3rdparty/webkit/symbols.filter |    5 +++++
+ 2 files changed, 6 insertions(+)
+
 --- a/src/3rdparty/webkit/WebKit.pri
 +++ b/src/3rdparty/webkit/WebKit.pri
 @@ -54,6 +54,7 @@ symbian {
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index d8f52eb..e6b7a3e 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -3,6 +3,11 @@ author: Fathi Boudra <fabo at debian.org>
 On Qt >= 4.5, debug info are disabled for Qt3Support and QtWebkit.
 This patch enable them.
 
+---
+ src/3rdparty/webkit/WebCore/WebCore.pro |    2 --
+ src/qt3support/qt3support.pro           |    3 ---
+ 2 files changed, 5 deletions(-)
+
 --- a/src/3rdparty/webkit/WebCore/WebCore.pro
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
 @@ -2952,8 +2952,6 @@ HEADERS += $$WEBKIT_API_HEADERS
diff --git a/debian/patches/20_install_qvfb.diff b/debian/patches/20_install_qvfb.diff
index f6736b0..1b0f0e8 100644
--- a/debian/patches/20_install_qvfb.diff
+++ b/debian/patches/20_install_qvfb.diff
@@ -1,6 +1,10 @@
 Description: build qvfb tool
 Author: Fathi Boudra <fabo at debian.org>
 
+---
+ tools/tools.pro |    2 ++
+ 1 file changed, 2 insertions(+)
+
 --- a/tools/tools.pro
 +++ b/tools/tools.pro
 @@ -44,6 +44,8 @@ embedded: SUBDIRS += makeqpf
diff --git a/debian/patches/23_permit_plugins_built_with_future_qt.diff b/debian/patches/23_permit_plugins_built_with_future_qt.diff
index d59e8b3..e5cca92 100644
--- a/debian/patches/23_permit_plugins_built_with_future_qt.diff
+++ b/debian/patches/23_permit_plugins_built_with_future_qt.diff
@@ -21,6 +21,10 @@ from rare user faults or weird system misconfigurations for more flexibility,
 installability and expand of forward binary compatibility beyond the same Qt
 4.x whenever possible.
 
+---
+ src/corelib/plugin/qlibrary.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
 @@ -826,7 +826,7 @@ bool QLibraryPrivate::isPlugin(QSettings
diff --git a/debian/patches/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff
index 6d74868..fce3988 100644
--- a/debian/patches/30_webkit_unaligned_access.diff
+++ b/debian/patches/30_webkit_unaligned_access.diff
@@ -12,6 +12,13 @@ Some compiler warnings about alignment remain, but I don't know if they are
 a real problem yet.
 ---
 
+---
+ src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp      |    4 ++--
+ src/3rdparty/webkit/JavaScriptCore/wtf/ListHashSet.h       |    9 +++------
+ src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp |    2 +-
+ src/3rdparty/webkit/WebCore/platform/text/StringHash.h     |    6 +++---
+ 4 files changed, 9 insertions(+), 12 deletions(-)
+
 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
 +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
 @@ -2336,13 +2336,13 @@ static TCMalloc_Central_FreeListPadded c
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index 98103f6..7301061 100644
--- a/debian/patches/40_alpha_ice.diff
+++ b/debian/patches/40_alpha_ice.diff
@@ -4,6 +4,11 @@ Description: Workaround for -fvisibility-inlines-hidden on alpha:
 Bug-Debian: http://bugs.debian.org/368883
 Author: Steve Langasek <vorlon at debian.org>
 
+---
+ src/corelib/global/qlibraryinfo.cpp |   14 ++++++++------
+ src/corelib/tools/qhash.h           |    2 +-
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
 @@ -85,12 +85,7 @@ class QLibraryInfoPrivate
diff --git a/debian/patches/41_disable_opengl_visibility.diff b/debian/patches/41_disable_opengl_visibility.diff
index 341bad7..5fddd38 100644
--- a/debian/patches/41_disable_opengl_visibility.diff
+++ b/debian/patches/41_disable_opengl_visibility.diff
@@ -1,5 +1,9 @@
 temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
 
+---
+ src/opengl/opengl.pro |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/src/opengl/opengl.pro
 +++ b/src/opengl/opengl.pro
 @@ -39,6 +39,7 @@ SOURCES += qgl.cpp \
diff --git a/debian/patches/50_kfreebsd_Q_OS.diff b/debian/patches/50_kfreebsd_Q_OS.diff
index c2eec96..0191d64 100644
--- a/debian/patches/50_kfreebsd_Q_OS.diff
+++ b/debian/patches/50_kfreebsd_Q_OS.diff
@@ -2,6 +2,10 @@ Author: Pino Toscano <pino at kde.org>
 Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL.
 Last-Update: 2010-10-06
 
+---
+ src/corelib/global/qglobal.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
 @@ -227,6 +227,8 @@ namespace QT_NAMESPACE {}
diff --git a/debian/patches/51_kfreebsd_strnstr_build_fix.diff b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
index 8440fbf..ea31b5c 100644
--- a/debian/patches/51_kfreebsd_strnstr_build_fix.diff
+++ b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
@@ -2,6 +2,11 @@ Description: Fix FTBFS on GNU/kFreeBSD caused by missing strnstr() on glibc syst
 Author: Fathi Boudra <fabo at debian.org>
 Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
 
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |    2 +-
+ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h         |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
 @@ -370,7 +370,7 @@
diff --git a/debian/patches/70_hppa_ldcw_fix.diff b/debian/patches/70_hppa_ldcw_fix.diff
index 71a959a..dcfbd34 100644
--- a/debian/patches/70_hppa_ldcw_fix.diff
+++ b/debian/patches/70_hppa_ldcw_fix.diff
@@ -2,6 +2,10 @@ author: LaMont Jones <lamont at bld-4.mmjgroup.com>
 
 patch from Ubuntu to properly support hppa.
 
+---
+ src/corelib/arch/parisc/q_ldcw.s |   14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
 --- a/src/corelib/arch/parisc/q_ldcw.s
 +++ b/src/corelib/arch/parisc/q_ldcw.s
 @@ -38,20 +38,10 @@
diff --git a/debian/patches/71_hppa_unaligned_access_fix_458133.diff b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
index 9a931e3..280092f 100644
--- a/debian/patches/71_hppa_unaligned_access_fix_458133.diff
+++ b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
@@ -2,6 +2,10 @@ author: Bernhard R. Link <brlink at debian.org>
 
 Fix unaligned access on hppa
 
+---
+ src/3rdparty/sha1/sha1.cpp |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- a/src/3rdparty/sha1/sha1.cpp
 +++ b/src/3rdparty/sha1/sha1.cpp
 @@ -149,10 +149,10 @@ static inline void sha1ProcessChunk(Sha1
diff --git a/debian/patches/80_hurd_max_path.diff b/debian/patches/80_hurd_max_path.diff
index 0503e3c..808e7b5 100644
--- a/debian/patches/80_hurd_max_path.diff
+++ b/debian/patches/80_hurd_max_path.diff
@@ -6,6 +6,10 @@ Description: PATH_MAX fix
  Fix a POSIX incompatibility (as programs should not rely on having PATH_MAX
  defined on all systems) and causes FTBFS on Hurd.
 
+---
+ src/3rdparty/clucene/src/CLucene/config/compiler.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/src/3rdparty/clucene/src/CLucene/config/compiler.h
 +++ b/src/3rdparty/clucene/src/CLucene/config/compiler.h
 @@ -136,6 +136,10 @@
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index 3440784..bb1a923 100644
--- a/debian/patches/92_armel_gcc43_valist_compat.diff
+++ b/debian/patches/92_armel_gcc43_valist_compat.diff
@@ -13,6 +13,11 @@ Subject: Restore QtCore ABI compatibility with binaries built with g++ 4.3 on ar
  original symbols.
 Forward: not-needed
 
+---
+ src/corelib/tools/qstring.cpp    |    5 +++++
+ src/corelib/tools/qvsnprintf.cpp |    6 ++++++
+ 2 files changed, 11 insertions(+)
+
 --- a/src/corelib/tools/qstring.cpp
 +++ b/src/corelib/tools/qstring.cpp
 @@ -5517,6 +5517,11 @@ QString &QString::vsprintf(const char* c
diff --git a/debian/patches/94_armv6_uname_entry.diff b/debian/patches/94_armv6_uname_entry.diff
index 4e53ac7..c9c7140 100644
--- a/debian/patches/94_armv6_uname_entry.diff
+++ b/debian/patches/94_armv6_uname_entry.diff
@@ -1,6 +1,10 @@
 Description: Add armv6 uname entry for armhf
 ---
 
+---
+ configure |    3 +++
+ 1 file changed, 3 insertions(+)
+
 --- a/configure
 +++ b/configure
 @@ -182,6 +182,9 @@ case $DPKG_ARCH in
diff --git a/debian/patches/96_webkit_no_gc_sections.diff b/debian/patches/96_webkit_no_gc_sections.diff
index 35cc494..db5a8e6 100644
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@ -7,6 +7,10 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2010-05-31 (mipsel added)
 
+---
+ src/3rdparty/webkit/WebCore/WebCore.pro |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/src/3rdparty/webkit/WebCore/WebCore.pro
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
 @@ -88,7 +88,7 @@ VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$$
diff --git a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
index aa75f2c..70c2c03 100644
--- a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
+++ b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
@@ -10,6 +10,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561203
 Origin: vendor
 Last-Update: 2010-06-06
 
+---
+ src/corelib/io/qprocess_unix.cpp |    3 +++
+ 1 file changed, 3 insertions(+)
+
 --- a/src/corelib/io/qprocess_unix.cpp
 +++ b/src/corelib/io/qprocess_unix.cpp
 @@ -524,6 +524,9 @@ static char **_q_dupEnvironment(const QP
diff --git a/debian/patches/armv6_Add_support_for_ARMv7_atomic_operations.patch b/debian/patches/armv6_Add_support_for_ARMv7_atomic_operations.patch
deleted file mode 100644
index a311c78..0000000
--- a/debian/patches/armv6_Add_support_for_ARMv7_atomic_operations.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-Description: Add support for ARMv7 atomic operations
-
-    ARMv7 adds the DMB (data memory barrier) instruction which we can use to
-    enforce memory barriers in QAtomicInt and QAtomicPointer. Other than
-    that, ARMv7 is identical to ARMv6.
-    
-    Adjust the ARMv6 code to relax the compiler memory barriers on the
-    *Relaxed() operations, and use *Relaxed() functions together the
-    appropriate compiler barriers in the *Acquire(), *Release(), and
-    *Ordered() functions. For "pure" ARMv6 code, the barriers are only
-    compiler barriers, but for ARMv7, we also emit the DMB instruction.
-
-    Fixed in Qt 4.8. See patchset:
-    f293b98  Silence preprocessor warnings about __TARGET_ARCH_ARM not being
-             defined
-    c7bf2d7  Fixed compile for symbian
-    dc8d096  Compile when detecting ARMv5
-    2c73f55  Compile when detecting ARMv5
-    82b4fff  Add support for ARMv7 atomic operations
-    7be2c58  Merge the armv6 and arm architectures
-    1c0b3237 Copy src/corelib/arch/qatomic_arm.h to
-             src/corelib/arch/qatomic_armv5.h
-    a0f69c0  Move symbian specific qatomic_generic_armv6.cpp
-
-Author: Bradley T. Hughes <bradley.hughes at nokia.com>
-Bug-Ubuntu: https://launchpad.net/bugs/490371
----
- src/corelib/arch/qatomic_armv6.h |  162 ++++++++++++++++++++++++++-------------
- 1 file changed, 111 insertions(+), 51 deletions(-)
-
---- a/src/corelib/arch/qatomic_armv6.h
-+++ b/src/corelib/arch/qatomic_armv6.h
-@@ -102,6 +102,15 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
- 
- #ifndef Q_CC_RVCT
- 
-+// use the DMB instruction when compiling for ARMv7
-+#ifndef Q_DATA_MEMORY_BARRIER
-+# define Q_DATA_MEMORY_BARRIER asm volatile("dmb
":::"memory")
-+#endif
-+#ifndef Q_COMPILER_MEMORY_BARRIER
-+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory")
-+#endif
-+
-+// ... but the implementation is otherwise identical to that for ARMv6
- inline bool QBasicAtomicInt::ref()
- {
-     register int newValue;
-@@ -138,7 +147,7 @@ inline bool QBasicAtomicInt::deref()
-     return newValue != 0;
- }
- 
--inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
-+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
- {
-     register int result;
-     asm volatile("0:
"
-@@ -153,11 +162,11 @@ inline bool QBasicAtomicInt::testAndSetO
-                  : [expectedValue] "r" (expectedValue),
-                    [newValue] "r" (newValue),
-                    [_q_value] "r" (&_q_value)
--                 : "cc", "memory");
-+                 : "cc");
-     return result == 0;
- }
- 
--inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
-+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
- {
-     register int originalValue;
-     register int result;
-@@ -171,11 +180,11 @@ inline int QBasicAtomicInt::fetchAndStor
-                    "+m" (_q_value)
-                  : [newValue] "r" (newValue),
-                    [_q_value] "r" (&_q_value)
--                 : "cc", "memory");
-+                 : "cc");
-     return originalValue;
- }
- 
--inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
-+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
- {
-     register int originalValue;
-     register int newValue;
-@@ -192,12 +201,12 @@ inline int QBasicAtomicInt::fetchAndAddO
-                    "+m" (_q_value)
-                  : [valueToAdd] "r" (valueToAdd),
-                    [_q_value] "r" (&_q_value)
--                 : "cc", "memory");
-+                 : "cc");
-     return originalValue;
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
- {
-     register T *result;
-     asm volatile("0:
"
-@@ -212,12 +221,12 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
-                  : [expectedValue] "r" (expectedValue),
-                    [newValue] "r" (newValue),
-                    [_q_value] "r" (&_q_value)
--                 : "cc", "memory");
-+                 : "cc");
-     return result == 0;
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
- {
-     register T *originalValue;
-     register int result;
-@@ -231,12 +240,12 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
-                    "+m" (_q_value)
-                  : [newValue] "r" (newValue),
-                    [_q_value] "r" (&_q_value)
--                 : "cc", "memory");
-+                 : "cc");
-     return originalValue;
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
- {
-     register T *originalValue;
-     register T *newValue;
-@@ -253,7 +262,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
-                    "+m" (_q_value)
-                  : [valueToAdd] "r" (valueToAdd * sizeof(T)),
-                    [_q_value] "r" (&_q_value)
--                 : "cc", "memory");
-+                 : "cc");
-     return originalValue;
- }
- 
-@@ -265,9 +274,18 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
- // RVCT embedded assembly documentation:
- // http://www.keil.com/support/man/docs/armcc/armcc_chddbeib.htm
- 
--// save our pragma state and switch to ARM mode
--#pragma push
--#pragma arm
-+#if __TARGET_ARCH_THUMB-0 < 4
-+// save our pragma state and switch to ARM mode (unless using Thumb2)
-+# pragma push
-+# pragma arm
-+#endif
-+
-+#ifndef Q_DATA_MEMORY_BARRIER
-+# define Q_DATA_MEMORY_BARRIER __schedule_barrier()
-+#endif
-+#ifndef Q_COMPILER_MEMORY_BARRIER
-+# define Q_COMPILER_MEMORY_BARRIER __schedule_barrier()
-+#endif
- 
- inline bool QBasicAtomicInt::ref()
- {
-@@ -299,7 +317,7 @@ inline bool QBasicAtomicInt::deref()
-     return newValue != 0;
- }
- 
--inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
-+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
- {
-     register int result;
-     retry:
-@@ -313,7 +331,7 @@ inline bool QBasicAtomicInt::testAndSetO
-     return result == 0;
- }
- 
--inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
-+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
- {
-     register int originalValue;
-     register int result;
-@@ -327,7 +345,7 @@ inline int QBasicAtomicInt::fetchAndStor
-     return originalValue;
- }
- 
--inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
-+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
- {
-     register int originalValue;
-     register int newValue;
-@@ -344,7 +362,7 @@ inline int QBasicAtomicInt::fetchAndAddO
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
- {
-     register T *result;
-     retry:
-@@ -359,7 +377,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
- {
-     register T *originalValue;
-     register int result;
-@@ -374,7 +392,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
- {
-     register T *originalValue;
-     register T *newValue;
-@@ -390,111 +408,153 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer
-     return originalValue;
- }
- 
--// go back to the previous pragma state (probably Thumb mode)
--#pragma pop
-+#if __TARGET_ARCH_THUMB-0 < 4
-+# pragma pop
- #endif
- 
--// common code
-+#endif
- 
--inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
--{
--    return testAndSetOrdered(expectedValue, newValue);
--}
-+// common code
- 
- inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
- {
--    return testAndSetOrdered(expectedValue, newValue);
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
- {
--    return testAndSetOrdered(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return testAndSetRelaxed(expectedValue, newValue);
- }
- 
--inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
-+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
- {
--    return fetchAndStoreOrdered(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
- {
--    return fetchAndStoreOrdered(newValue);
-+    int returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
- {
--    return fetchAndStoreOrdered(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndStoreRelaxed(newValue);
- }
- 
--inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
-+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
- {
--    return fetchAndAddOrdered(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    int returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
-+
- inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
- {
--    return fetchAndAddOrdered(valueToAdd);
-+    int returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
- {
--    return fetchAndAddOrdered(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndAddRelaxed(valueToAdd);
- }
- 
--template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
-+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
- {
--    return testAndSetOrdered(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    int returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
- {
--    return testAndSetOrdered(expectedValue, newValue);
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
- {
--    return testAndSetOrdered(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return testAndSetRelaxed(expectedValue, newValue);
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
- {
--    return fetchAndStoreOrdered(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    bool returnValue = testAndSetAcquire(expectedValue, newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
- {
--    return fetchAndStoreOrdered(newValue);
-+    T *returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
- {
--    return fetchAndStoreOrdered(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndStoreRelaxed(newValue);
- }
- 
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
- {
--    return fetchAndAddOrdered(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    T *returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
- {
--    return fetchAndAddOrdered(valueToAdd);
-+    T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
- }
- 
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
- {
--    return fetchAndAddOrdered(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndAddRelaxed(valueToAdd);
- }
- 
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+#undef Q_DATA_MEMORY_BARRIER
-+#undef Q_COMPILER_MEMORY_BARRIER
-+
- QT_END_NAMESPACE
- 
- QT_END_HEADER
diff --git a/debian/patches/armv6_Include_explicitly_IT_instructions.patch b/debian/patches/armv6_Include_explicitly_IT_instructions.patch
index 22ab9d2..b7408f2 100644
--- a/debian/patches/armv6_Include_explicitly_IT_instructions.patch
+++ b/debian/patches/armv6_Include_explicitly_IT_instructions.patch
@@ -8,7 +8,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/673085
 
 --- a/src/corelib/arch/qatomic_armv6.h
 +++ b/src/corelib/arch/qatomic_armv6.h
-@@ -144,6 +144,7 @@ inline bool QBasicAtomicInt::testAndSetO
+@@ -152,6 +152,7 @@ inline bool QBasicAtomicInt::testAndSetR
      asm volatile("0:
"
                   "ldrex %[result], [%[_q_value]]
"
                   "eors %[result], %[result], %[expectedValue]
"
@@ -16,7 +16,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/673085
                   "strexeq %[result], %[newValue], [%[_q_value]]
"
                   "teqeq %[result], #1
"
                   "beq 0b
"
-@@ -202,6 +203,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
+@@ -210,6 +211,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
      asm volatile("0:
"
                   "ldrex %[result], [%[_q_value]]
"
                   "eors %[result], %[result], %[expectedValue]
"
diff --git a/debian/patches/buildable_appchooser_states_demos.patch b/debian/patches/buildable_appchooser_states_demos.patch
index dcaa602..04a1d85 100644
--- a/debian/patches/buildable_appchooser_states_demos.patch
+++ b/debian/patches/buildable_appchooser_states_demos.patch
@@ -2,6 +2,11 @@ Description: make states and appchooser demos buildable
 Bug-Debian: http://bugs.debian.org/616500
 Author: Fathi Boudra <fabo at debian.org>
 Last-Update: 2011-03-05
+---
+ examples/animation/appchooser/appchooser.pro |    3 ++-
+ examples/animation/states/states.pro         |    4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
 --- a/examples/animation/appchooser/appchooser.pro
 +++ b/examples/animation/appchooser/appchooser.pro
 @@ -3,7 +3,8 @@ RESOURCES = appchooser.qrc
diff --git a/debian/patches/kfreebsd_monotonic_clock.diff b/debian/patches/kfreebsd_monotonic_clock.diff
index 94a6b54..86f0b17 100644
--- a/debian/patches/kfreebsd_monotonic_clock.diff
+++ b/debian/patches/kfreebsd_monotonic_clock.diff
@@ -15,6 +15,10 @@ operate without monotonic clock because qt_safe_select() will indicate timeout
 earlier than it is supposed when underlying select() call is interrupted
 (errno=EINTR).
 
+---
+ config.tests/unix/clock-gettime/clock-gettime.pri |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/config.tests/unix/clock-gettime/clock-gettime.pri
 +++ b/config.tests/unix/clock-gettime/clock-gettime.pri
 @@ -1,2 +1,2 @@
diff --git a/debian/patches/powerpc_designer_gstabs.diff b/debian/patches/powerpc_designer_gstabs.diff
index 710e1a4..5349b44 100644
--- a/debian/patches/powerpc_designer_gstabs.diff
+++ b/debian/patches/powerpc_designer_gstabs.diff
@@ -14,6 +14,10 @@ with preprocessed source if appropriate.
 
 [2] https://buildd.debian.org/status/fetch.php?pkg=qt4-x11&arch=powerpc&ver=4%3A4.7.2-4&stamp=1304320067
 
+---
+ tools/designer/src/components/signalsloteditor/signalsloteditor.pri |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor.pri
 +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor.pri
 @@ -19,3 +19,10 @@ SOURCES += $$PWD/signalslot_utils.cpp \
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index 56db4d4..4956582 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -5,6 +5,10 @@ Forwarded: no
 Origin: vendor
 Last-Update: 2011-04-27
 
+---
+ configure |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/configure
 +++ b/configure
 @@ -3145,7 +3145,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
diff --git a/debian/patches/qtdebug_syslog.patch b/debian/patches/qtdebug_syslog.patch
index 4049cd5..4ddfbc4 100644
--- a/debian/patches/qtdebug_syslog.patch
+++ b/debian/patches/qtdebug_syslog.patch
@@ -1,6 +1,11 @@
 Description: send Q_ASSERT, qDebug, qWarning and qFatal messages to syslog
 Forwarded: not-needed
 Author: Thiago Macieira <thiago at kde.org>
+---
+ src/corelib/global/qglobal.cpp          |   24 ++++++++++++++++++++++++
+ src/corelib/kernel/qcoreapplication_p.h |    2 ++
+ 2 files changed, 26 insertions(+)
+
 --- a/src/corelib/global/qglobal.cpp
 +++ b/src/corelib/global/qglobal.cpp
 @@ -50,6 +50,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 98f5aaa..afc60ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,4 +49,3 @@ sh.diff
 kfreebsd_monotonic_clock.diff
 powerpc_designer_gstabs.diff
 armv6_Include_explicitly_IT_instructions.patch
-armv6_Add_support_for_ARMv7_atomic_operations.patch
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 3762799..c6edc06 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -5,6 +5,10 @@ Forwarded: no
 Origin: vendor
 Last-Update: 2011-04-27
 
+---
+ configure |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
 --- a/configure
 +++ b/configure
 @@ -3185,6 +3185,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then

-- 
Qt 4 packaging

More information about the pkg-kde-commits mailing list