[Python-apps-commits] r6439 - in packages/parti-all/trunk/debian (8 files)

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

    Date: Sunday, December 26, 2010 @ 17:23:38
  Author: nomadium-guest
Revision: 6439

* Add myself to Uploaders.
* Add Suggests on openssh-{client,server} for xpra.
* Move clean target to debian/clean file.
* Add a couple of patches:
  - manpage.patch: Fix a typo in xpra manpage.
  - run_xauth.patch: Run xauth regardless of __debug__.
* Simplifiy debian/rules even more.
* Install upstream changelog file.
* Add a to-do file.

Added:
  packages/parti-all/trunk/debian/00TODO
  packages/parti-all/trunk/debian/clean
  packages/parti-all/trunk/debian/patches/
  packages/parti-all/trunk/debian/patches/manpage.patch
  packages/parti-all/trunk/debian/patches/run_xauth.patch
  packages/parti-all/trunk/debian/patches/series
Modified:
  packages/parti-all/trunk/debian/control
  packages/parti-all/trunk/debian/rules

Added: packages/parti-all/trunk/debian/00TODO
===================================================================
--- packages/parti-all/trunk/debian/00TODO	                        (rev 0)
+++ packages/parti-all/trunk/debian/00TODO	2010-12-26 17:23:38 UTC (rev 6439)
@@ -0,0 +1 @@
+write a manpage for parti

Added: packages/parti-all/trunk/debian/clean
===================================================================
--- packages/parti-all/trunk/debian/clean	                        (rev 0)
+++ packages/parti-all/trunk/debian/clean	2010-12-26 17:23:38 UTC (rev 6439)
@@ -0,0 +1,2 @@
+xpra/xpra.wait_for_x_server.c
+wimpiggy/lowlevel/wimpiggy.lowlevel.bindings.c

Modified: packages/parti-all/trunk/debian/control
===================================================================
--- packages/parti-all/trunk/debian/control	2010-12-26 09:02:55 UTC (rev 6438)
+++ packages/parti-all/trunk/debian/control	2010-12-26 17:23:38 UTC (rev 6439)
@@ -2,7 +2,8 @@
 Section: x11
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>,
+ Miguel Landaeta <miguel at miguel.cc>
 Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxtst-dev, libxcomposite-dev, libxdamage-dev, python-all-dev (>= 2.6.6-2), python-pyrex, python-gobject-dev, python-gtk2-dev
 X-Python-Version: all
 Standards-Version: 3.9.1
@@ -21,6 +22,7 @@
 Package: xpra
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-wimpiggy (=${binary:Version}), python-gtk2, xvfb, x11-xserver-utils
+Suggests: openssh-client, openssh-server
 Description: tool to detach/reattach running X programs
  Xpra gives you the functionality of GNU Screen for X applications.
  .

Added: packages/parti-all/trunk/debian/patches/manpage.patch
===================================================================
--- packages/parti-all/trunk/debian/patches/manpage.patch	                        (rev 0)
+++ packages/parti-all/trunk/debian/patches/manpage.patch	2010-12-26 17:23:38 UTC (rev 6439)
@@ -0,0 +1,21 @@
+Description: Corrections to manual pages
+ * xpra.1: The command line option referred to in the “Environment”
+   section is called --start-child, not --with-child.
+ * xpra.1: Use real minus signs (\-) rather than hyphens.
+Origin: Debian
+Author: Michael Schutte <michi at uiae.at>
+Forwarded: http://code.google.com/p/partiwm/source/detail?r=604e612777
+
+Index: devel/xpra.1
+===================================================================
+--- devel.orig/xpra.1	2010-02-17 18:36:45.000000000 +0100
++++ devel/xpra.1	2010-02-17 18:42:25.000000000 +0100
+@@ -216,7 +216,7 @@
+ .SH ENVIRONMENT
+ .TP
+ \fBDISPLAY\fP
+-\fBxpra start --with-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

Added: packages/parti-all/trunk/debian/patches/run_xauth.patch
===================================================================
--- packages/parti-all/trunk/debian/patches/run_xauth.patch	                        (rev 0)
+++ packages/parti-all/trunk/debian/patches/run_xauth.patch	2010-12-26 17:23:38 UTC (rev 6439)
@@ -0,0 +1,23 @@
+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)
+ 

Added: packages/parti-all/trunk/debian/patches/series
===================================================================
--- packages/parti-all/trunk/debian/patches/series	                        (rev 0)
+++ packages/parti-all/trunk/debian/patches/series	2010-12-26 17:23:38 UTC (rev 6439)
@@ -0,0 +1,2 @@
+manpage.patch
+run_xauth.patch

Modified: packages/parti-all/trunk/debian/rules
===================================================================
--- packages/parti-all/trunk/debian/rules	2010-12-26 09:02:55 UTC (rev 6438)
+++ packages/parti-all/trunk/debian/rules	2010-12-26 17:23:38 UTC (rev 6439)
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
-
 LDFLAGS=-Wl,--as-needed
 %:
 	dh $@ --with python2
 
-override_dh_clean:
-	dh_clean xpra/xpra.wait_for_x_server.c wimpiggy/lowlevel/wimpiggy.lowlevel.bindings.c
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS