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

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Tue Mar 12 23:26:20 UTC 2013


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

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

    Refreshed patch qtdebug_syslog.patch
---
 debian/changelog                    |    1 +
 debian/patches/qtdebug_syslog.patch |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e09ff8..cd82978 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ qt4-x11 (4:4.8.4+dfsg-1) UNRELEASED; urgency=low
     - QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under\
       _gnome-shell.patch
     - 0195-compositing-properties.diff
+    - qtdebug_syslog.patch
   * Update symbols
 
  -- Timo Jyrinki <timo at debian.org>  Mon, 21 Jan 2013 08:37:04 +0000
diff --git a/debian/patches/qtdebug_syslog.patch b/debian/patches/qtdebug_syslog.patch
index d7a9ecd..c4edae9 100644
--- a/debian/patches/qtdebug_syslog.patch
+++ b/debian/patches/qtdebug_syslog.patch
@@ -16,7 +16,7 @@ Author: Thiago Macieira <thiago at kde.org>
  #endif
  
  #include <stdio.h>
-@@ -87,6 +88,8 @@
+@@ -92,6 +93,8 @@
  
  _LIT(qt_S60Filter, "Series60v?.*.sis");
  _LIT(qt_symbianSystemInstallDir, "z:\system\install\");
@@ -25,7 +25,7 @@ Author: Thiago Macieira <thiago at kde.org>
  #endif
  
  QT_BEGIN_NAMESPACE
-@@ -2225,6 +2228,27 @@ void qt_message_output(QtMsgType msgType
+@@ -2288,6 +2291,27 @@ void qt_message_output(QtMsgType msgType
  #else
          fprintf(stderr, "%s
", buf);
          fflush(stderr);

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list