[Python-apps-commits] r7485 - in packages/xpra/trunk/debian (5 files)

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

    Date: Thursday, August 25, 2011 @ 22:14:18
  Author: aelmahmoudy-guest
Revision: 7485

* New upstream release.
* Dropped patches that got applied upstream: manpage.patch, run_xauth.patch,
  setup.diff

Modified:
  packages/xpra/trunk/debian/changelog
  packages/xpra/trunk/debian/patches/series
Deleted:
  packages/xpra/trunk/debian/patches/manpage.patch
  packages/xpra/trunk/debian/patches/run_xauth.patch
  packages/xpra/trunk/debian/patches/setup.diff

Modified: packages/xpra/trunk/debian/changelog
===================================================================
--- packages/xpra/trunk/debian/changelog	2011-08-25 22:11:29 UTC (rev 7484)
+++ packages/xpra/trunk/debian/changelog	2011-08-25 22:14:18 UTC (rev 7485)
@@ -1,3 +1,11 @@
+xpra (0.0.7.23+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Dropped patches that got applied upstream: manpage.patch, run_xauth.patch,
+    setup.diff
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Sun, 25 Jul 2011 04:09:42 +0200
+
 xpra (0.0.7.22.1+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.

Deleted: packages/xpra/trunk/debian/patches/manpage.patch
===================================================================
--- packages/xpra/trunk/debian/patches/manpage.patch	2011-08-25 22:11:29 UTC (rev 7484)
+++ packages/xpra/trunk/debian/patches/manpage.patch	2011-08-25 22:14:18 UTC (rev 7485)
@@ -1,16 +0,0 @@
-Description: Corrections to manual pages
- * Use real minus signs (\-) rather than hyphens.
-Origin: Debian
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
-
---- a/xpra.1
-+++ b/xpra.1
-@@ -344,7 +344,7 @@
- .SH ENVIRONMENT
- .TP
- \fBDISPLAY\fP
--\fBxpra start \-\-start-child=...\fP sets this variable in the
-+\fBxpra start \-\-start\-child=...\fP sets this variable in the
- environment of the child to point to the xpra display.
- 
- \fBxpra attach\fP, on the other hand, uses this variable to determine

Deleted: packages/xpra/trunk/debian/patches/run_xauth.patch
===================================================================
--- packages/xpra/trunk/debian/patches/run_xauth.patch	2011-08-25 22:11:29 UTC (rev 7484)
+++ packages/xpra/trunk/debian/patches/run_xauth.patch	2011-08-25 22:14:18 UTC (rev 7485)
@@ -1,23 +0,0 @@
-Description: Run xauth regardless of __debug__
- “assert not subprocess.call()” is a no-op if Python is run with
- optimizations enabled.  Use an explicit raise instead.
-Origin: Debian
-Author: Michael Schutte <michi at uiae.at>
-Forwarded: yes
-
-Index: devel/xpra/scripts/server.py
-===================================================================
---- devel.orig/xpra/scripts/server.py	2010-02-21 19:31:47.000000000 +0100
-+++ devel/xpra/scripts/server.py	2010-02-21 19:32:10.000000000 +0100
-@@ -246,8 +246,9 @@
-         raw_cookie = os.urandom(16)
-         baked_cookie = raw_cookie.encode("hex")
-         try:
--            assert not subprocess.call(["xauth", "add", display_name,
--                                        "MIT-MAGIC-COOKIE-1", baked_cookie])
-+            if subprocess.call(["xauth", "add", display_name,
-+                                "MIT-MAGIC-COOKIE-1", baked_cookie]) != 0:
-+                raise OSError("non-zero exit code")
-         except OSError, e:
-             sys.stderr.write("Error running xauth: %s\n" % e)
- 

Modified: packages/xpra/trunk/debian/patches/series
===================================================================
--- packages/xpra/trunk/debian/patches/series	2011-08-25 22:11:29 UTC (rev 7484)
+++ packages/xpra/trunk/debian/patches/series	2011-08-25 22:14:18 UTC (rev 7485)
@@ -1,4 +1 @@
-manpage.patch
-run_xauth.patch
 private-pkg.diff
-setup.diff

Deleted: packages/xpra/trunk/debian/patches/setup.diff
===================================================================
--- packages/xpra/trunk/debian/patches/setup.diff	2011-08-25 22:11:29 UTC (rev 7484)
+++ packages/xpra/trunk/debian/patches/setup.diff	2011-08-25 22:14:18 UTC (rev 7485)
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -24,7 +24,7 @@
-                 '-l': 'libraries'}
-     cmd = "pkg-config --libs --cflags %s" % (" ".join(packages),)
-     (status, output) = commands.getstatusoutput(cmd)
--    if not (os.WIFEXITED(status) and os.WEXITSTATUS(status) == 0):
-+    if not (os.WIFEXITED(status) and os.WEXITSTATUS(status) == 0) and not ('clean' in sys.argv):
-         raise Exception, ("call to pkg-config ('%s') failed" % (cmd,))
-     for token in output.split():
-         if flag_map.has_key(token[:2]):