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

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

    Date: Sunday, June 3, 2012 @ 17:40:20
  Author: aelmahmoudy-guest
Revision: 8831

* Removed xpra_launcher.diff patch, it was wrong !
* debian/xpra.install: Install xpra_launcher
* debian/private_pkg.diff: also add /usr/lib/xpra to sys.path for
  xpra_launcher script.

Modified:
  packages/xpra/trunk/debian/changelog
  packages/xpra/trunk/debian/patches/private-pkg.diff
  packages/xpra/trunk/debian/patches/series
  packages/xpra/trunk/debian/xpra.install
Deleted:
  packages/xpra/trunk/debian/patches/xpra_launcher.diff

Modified: packages/xpra/trunk/debian/changelog
===================================================================
--- packages/xpra/trunk/debian/changelog	2012-06-03 17:34:18 UTC (rev 8830)
+++ packages/xpra/trunk/debian/changelog	2012-06-03 17:40:20 UTC (rev 8831)
@@ -1,3 +1,12 @@
+xpra (0.3.1+dfsg-3) unstable; urgency=low
+
+  * Removed xpra_launcher.diff patch, it was wrong !
+  * debian/xpra.install: Install xpra_launcher
+  * debian/private_pkg.diff: also add /usr/lib/xpra to sys.path for
+    xpra_launcher script.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Sun, 03 Jun 2012 19:37:44 +0200
+
 xpra (0.3.1+dfsg-2) unstable; urgency=low
 
   * debian/xpra.install: Install icons & desktop launcher. (Closes: #674824)

Modified: packages/xpra/trunk/debian/patches/private-pkg.diff
===================================================================
--- packages/xpra/trunk/debian/patches/private-pkg.diff	2012-06-03 17:34:18 UTC (rev 8830)
+++ packages/xpra/trunk/debian/patches/private-pkg.diff	2012-06-03 17:40:20 UTC (rev 8831)
@@ -32,3 +32,13 @@
  import xpra.scripts.main
  
  sys.exit(xpra.scripts.main.main(__file__, sys.argv))
+--- a/scripts/xpra_launcher	2012-06-03 19:16:59.330360871 +0200
++++ b/scripts/xpra_launcher	2012-06-03 19:20:40.515457660 +0200
+@@ -1,5 +1,7 @@
+ #!/usr/bin/env python
+ 
++import sys
++sys.path.append("/usr/lib/xpra")
+ from xpra.scripts.client_launcher import main
+ 
+ main()

Modified: packages/xpra/trunk/debian/patches/series
===================================================================
--- packages/xpra/trunk/debian/patches/series	2012-06-03 17:34:18 UTC (rev 8830)
+++ packages/xpra/trunk/debian/patches/series	2012-06-03 17:40:20 UTC (rev 8831)
@@ -1,2 +1 @@
 private-pkg.diff
-xpra_launcher.diff

Deleted: packages/xpra/trunk/debian/patches/xpra_launcher.diff
===================================================================
--- packages/xpra/trunk/debian/patches/xpra_launcher.diff	2012-06-03 17:34:18 UTC (rev 8830)
+++ packages/xpra/trunk/debian/patches/xpra_launcher.diff	2012-06-03 17:40:20 UTC (rev 8831)
@@ -1,17 +0,0 @@
-Description: Correct the name of executable to run
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
-Bug: http://xpra.org/trac/attachment/ticket/136
-Forwarded: http://xpra.org/trac/attachment/ticket/136/xpra_launcher.diff
---- a/xpra_launcher.desktop
-+++ b/xpra_launcher.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Xpra Launcher
- Comment=Connect to an Xpra session
--TryExec=xpra_launcher
--Exec=xpra_launcher
-+TryExec=xpra
-+Exec=xpra
- Icon=xpra
- Terminal=false
- Type=Application

Modified: packages/xpra/trunk/debian/xpra.install
===================================================================
--- packages/xpra/trunk/debian/xpra.install	2012-06-03 17:34:18 UTC (rev 8830)
+++ packages/xpra/trunk/debian/xpra.install	2012-06-03 17:40:20 UTC (rev 8831)
@@ -1,5 +1,6 @@
 usr/lib/*/*/xpra usr/lib/xpra/
 usr/share/man/man1/xpra.1
 usr/bin/xpra
+usr/bin/xpra_launcher
 usr/share/xpra/icons
 usr/share/applications