[Python-apps-commits] r7895 - in packages/xpra/trunk/debian (4 files)

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

    Date: Thursday, December 1, 2011 @ 13:15:08
  Author: aelmahmoudy-guest
Revision: 7895

* New upstream release.
* Removed patches that are included upstream: typos.diff,
  backward-compatibility.diff

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

Modified: packages/xpra/trunk/debian/changelog
===================================================================
--- packages/xpra/trunk/debian/changelog	2011-11-30 17:33:18 UTC (rev 7894)
+++ packages/xpra/trunk/debian/changelog	2011-12-01 13:15:08 UTC (rev 7895)
@@ -1,3 +1,11 @@
+xpra (0.0.7.31+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed patches that are included upstream: typos.diff,
+    backward-compatibility.diff
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Thu, 01 Dec 2011 14:11:39 +0200
+
 xpra (0.0.7.30+dfsg-1) unstable; urgency=low
 
   * New upstream release.

Deleted: packages/xpra/trunk/debian/patches/backward-compatibility.diff
===================================================================
--- packages/xpra/trunk/debian/patches/backward-compatibility.diff	2011-11-30 17:33:18 UTC (rev 7894)
+++ packages/xpra/trunk/debian/patches/backward-compatibility.diff	2011-12-01 13:15:08 UTC (rev 7895)
@@ -1,26 +0,0 @@
-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-30 17:33:18 UTC (rev 7894)
+++ packages/xpra/trunk/debian/patches/series	2011-12-01 13:15:08 UTC (rev 7895)
@@ -1,3 +1 @@
 private-pkg.diff
-typos.diff
-backward-compatibility.diff

Deleted: packages/xpra/trunk/debian/patches/typos.diff
===================================================================
--- packages/xpra/trunk/debian/patches/typos.diff	2011-11-30 17:33:18 UTC (rev 7894)
+++ packages/xpra/trunk/debian/patches/typos.diff	2011-12-01 13:15:08 UTC (rev 7895)
@@ -1,15 +0,0 @@
-Description: Fix typo in manpage
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
-Forwarded: http://xpra.org/trac/attachment/ticket/37/typos.diff
-Bug: http://xpra.org/trac/ticket/37
---- a/xpra.1
-+++ b/xpra.1
-@@ -217,7 +217,7 @@
- Sets the name of this session. This value may be used in
- notifications, utilities, tray menu, etc.
- Setting this value on the server provides a default value which
--may be overriden on the client.
-+may be overridden on the client.
- .TP
- \fB\-\-encoding\fP=\fIENCODING\fP
- This specifies the image encoding to use, there are 3 options: