[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit a258f7ecb1217ad76893f65256c74523f2a57493
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Dec 5 00:52:58 2010 +0200

    Refresh patches once again.
    
    It's needed after removal of some patches in previous commits.
---
 debian/patches/0195-compositing-properties.diff    |    4 ++--
 debian/patches/01_debian_append_qt4_suffix.diff    |    8 ++++----
 debian/patches/08_configure_quilt_compat.diff      |    2 +-
 .../patches/12_add_nostrip_for_debug_packages.diff |    7 ++++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index 38aa986..26e5322 100644
--- a/debian/patches/0195-compositing-properties.diff
+++ b/debian/patches/0195-compositing-properties.diff
@@ -48,8 +48,8 @@ bugs.kde.org number : none
 -        data.fstrut_dirty = 1;
  
          // declare the widget's window role
-         QByteArray windowRole;
-@@ -841,10 +854,6 @@ void QWidgetPrivate::create_sys(WId wind
+         if (QTLWExtra *topData = maybeTopData()) {
+@@ -837,10 +850,6 @@ void QWidgetPrivate::create_sys(WId wind
          XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                          XA_WINDOW, 32, PropModeReplace,
                          (unsigned char *)&X11->wm_client_leader, 1);
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index 4035167..cd2fbfe 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -64,7 +64,7 @@ Forwarded: not-needed
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -4582,7 +4582,7 @@ END {
+@@ -4574,7 +4574,7 @@ END {
  }
  
  # build qmake
@@ -73,7 +73,7 @@ Forwarded: not-needed
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -8000,8 +8000,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -7992,8 +7992,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -84,7 +84,7 @@ Forwarded: not-needed
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -8397,11 +8397,11 @@ EXEC=""
+@@ -8389,11 +8389,11 @@ EXEC=""
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -98,7 +98,7 @@ Forwarded: not-needed
  fi
  
  # .projects      -> projects to process
-@@ -8580,7 +8580,7 @@ for file in .projects .projects.3; do
+@@ -8572,7 +8572,7 @@ for file in .projects .projects.3; do
          QMAKE_SPEC_ARGS="-spec $SPEC"
          echo $ECHO_N "  for $a$ECHO_C"
  
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 7c1e853..0eafb5a 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -3,7 +3,7 @@ It breaks qmake projects search.
 
 --- a/configure
 +++ b/configure
-@@ -8453,7 +8453,7 @@ fi
+@@ -8445,7 +8445,7 @@ fi
  # .projects.3    -> the rest
  rm -f .projects .projects.1 .projects.2 .projects.3
  
diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff
index f61b8dd..f721db5 100644
--- a/debian/patches/12_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/12_add_nostrip_for_debug_packages.diff
@@ -6,11 +6,12 @@ let dh_strip do it to generate debug packages.
 
 --- a/configure
 +++ b/configure
-@@ -651,6 +651,7 @@ rm -f "$outpath/config.tests/.qmake.cach
+@@ -650,6 +650,8 @@ mkdir -p "$outpath/config.tests"
+ rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  
- QMakeVar add QMAKE_LFLAGS -Wl,--as-needed
 +QMakeVar add CONFIG nostrip
- 
++
  QMakeVar add styles "cde mac motif plastique cleanlooks windows"
  QMakeVar add decorations "default windows styled"
+ QMakeVar add mouse-drivers "pc"

-- 
Qt 4 packaging