[Python-apps-commits] r7764 - in packages/xpra/trunk/debian (3 files)

[aelmahmoudy-guest at users.alioth.debian.org]

    Date: Monday, November 7, 2011 @ 17:45:38
  Author: aelmahmoudy-guest
Revision: 7764

* Added backward-compatibility.diff patch to add a fix for backward
  compatibility with older releases of xpra.

Added:
  packages/xpra/trunk/debian/patches/backward-compatibility.diff
Modified:
  packages/xpra/trunk/debian/changelog
  packages/xpra/trunk/debian/patches/series

Modified: packages/xpra/trunk/debian/changelog
===================================================================
--- packages/xpra/trunk/debian/changelog	2011-11-07 07:53:31 UTC (rev 7763)
+++ packages/xpra/trunk/debian/changelog	2011-11-07 17:45:38 UTC (rev 7764)
@@ -3,8 +3,10 @@
   * New upstream release.
   * debian/control: Removed X-Python-Version field.
   * Added typos.diff patch to fix a typo in xpra manpage.
+  * Added backward-compatibility.diff patch to add a fix for backward
+    compatibility with older releases of xpra.
 
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Wed, 02 Nov 2011 00:53:09 +0200
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Mon, 07 Nov 2011 19:19:21 +0200
 
 xpra (0.0.7.27+dfsg-1) unstable; urgency=low
 

Added: packages/xpra/trunk/debian/patches/backward-compatibility.diff
===================================================================
--- packages/xpra/trunk/debian/patches/backward-compatibility.diff	                        (rev 0)
+++ packages/xpra/trunk/debian/patches/backward-compatibility.diff	2011-11-07 17:45:38 UTC (rev 7764)
@@ -0,0 +1,26 @@
+Description: Fix for backward compatibility with older releases of xpra
+Bug: http://xpra.org/trac/ticket/38
+Origin: http://xpra.org/trac/changeset?old_path=%2ftrunk%2fsrc&old=269&new_path=%2ftrunk%2fsrc&new=270
+Index: trunk/src/xpra/protocol.py
+===================================================================
+--- a/xpra/protocol.py	(revision 251)
++++ b/xpra/protocol.py	(revision 270)
+@@ -154,11 +154,11 @@
+             data = bencode(packet)
+             l = len(data)
+-            if l<=1024:
+-                #send size and data together (low copy overhead):
+-                self._queue_write("PS%014d%s" % (l, data), True)
+-            else:
+-                if self._send_size:
+-                    self._queue_write("PS%014d" % l)
+-                self._queue_write(data, True)
++            if self._send_size:
++                if l<=1024:
++                    #send size and data together (low copy overhead):
++                    self._queue_write("PS%014d%s" % (l, data), True)
++                    return
++                self._queue_write("PS%014d" % l)
++            self._queue_write(data, True)
+ 
+     def _write_thread_loop(self):

Modified: packages/xpra/trunk/debian/patches/series
===================================================================
--- packages/xpra/trunk/debian/patches/series	2011-11-07 07:53:31 UTC (rev 7763)
+++ packages/xpra/trunk/debian/patches/series	2011-11-07 17:45:38 UTC (rev 7764)
@@ -1,2 +1,3 @@
 private-pkg.diff
 typos.diff
+backward-compatibility.diff