Your message dated Sat, 1 Dec 2012 13:46:44 +0100 with message-id <20121201124644.GN5634@radis.cristau.org> and subject line Re: Bug#688729: unblock xpra/0.3.9+dfsg-2 has caused the Debian Bug report #688729, regarding unblock xpra/0.3.11+dfsg-1 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 688729: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688729 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Cc: "Ahmed El-Mahmoudy" <aelmahmoudy@sabily.org>
- Subject: unblock xpra/0.3.9+dfsg-2
- From: Dmitry Smirnov <onlyjob@member.fsf.org>
- Date: Tue, 25 Sep 2012 15:41:47 +1000
- Message-id: <201209251541.52508.onlyjob@member.fsf.org>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package 'xpra' This is major strategically important update. Upstream treat 0.3.x versions as most conservative bugfix-only branch. Earlier development moved to 0.4.x (deprecated) then to 0.5.x (current stable) and recently to 0.6.x (experimental). Upstream changelog (below) highlighting many important fixes for protocol and clipboard bugs rendering package unusable in some cases. According to upstream 0.3.9 is expected to be a last update to 0.3.x branch. It is providing important changes for protocol compatibility with later versions. #680244 is also expressing some concerns regarding current state of 0.3.2 in testing. As for packaging, we apologise for the number of introduced changes (see attached diff). One of the most important ones we had to do is to expose python modules publicly for interaction with frontends as xpra is both application and a module. ################## Changelog: xpra (0.3.9+dfsg-2) unstable; urgency=low * Override dh_compress to prevent compression of example conf file. (Closes: #688235) xpra (0.3.9+dfsg-1) unstable; urgency=low * New upstream release. * debian/README.Debian: Remove Known issues section, it is invalidated with 0.3.6 release. * debian/rules: Allow overriding of VER in get-orig-source. [ Dmitry Smirnov ] * debian/rules: export LDFLAGS using DEB_LDFLAGS_MAINT_APPEND. * debian/xpra.install: install only *.png icons. * Remove debian/parti.* (we're not shipping parti). * Publicly expose xpra modules. + Dropped private-pkg.diff patch. + debian/xpra.install: install xpra modules publicly. * debian/watch: corrected version mangle (Closes: #674964) * Removing debian/repack in favour of get-orig-source * binary and source compression to xz: + debian/rules: added override for dh_builddeb + Added debian/source/options * debian/copyright: add missing copyright paragraph. xpra (0.3.6+dfsg-1) unstable; urgency=low * debian/control: Added Dmitry Smirnov to Uploaders * New upstream release. (Closes: #683133) [ Dmitry Smirnov ] * Remove debian/docs * debian/copyright: + Consolidated and updated copyright info. + Update copyright format. * debian/control: added Recommends: xserver-xorg-video-dummy * debian/rules: avoid dropping LDFLAGS when passing --as-needed (fixes Hardening) * install sample 'dummy.xorg.conf' and README.Debian with instructions how to use Xdummy (Closes: #681051). * separating man pages from .install to .manpages xpra (0.3.4+dfsg-1) unstable; urgency=low * New upstream release. xpra (0.3.3+dfsg-1) unstable; urgency=low * New upstream release. ################## ################## Upstream Changelog: v0.3.9 (2012-09-08) ====================== -- fix man page typo -- fix non bash login shell compatibility -- fix xpra screenshot argument parsing error handling v0.3.8 (2012-09-05) ====================== -- zlib compatibility fix: use chunked decompression when supported (newer versions) v0.3.7 (2012-08-29) ====================== -- fix zlib compression in raw packet mode: always flush the buffer -- fix big clipboard packets causing disconnection: just drop them instead -- force disconnection after irrecoverable network parsing error -- support compressed cursors -- fix incomplete cloning of attributes causing default values to be used -- fix window refresh: do not skip all windows after a hidden one! v0.3.6 (2012-08-16) ====================== -- fix clipboard atom packing (was more noticeable with qt and Java applications) -- fix clipboard selection for non X11 clients: only 'multiple' codepath requires X11 bindings -- fix python3 build -- fix potential double free in x264 error path -- fix logging format error on "window dimensions have changed.." (parameter grouping was wrong) -- fix colour bleeding with x264 (ie: green on black text) -- remove incorrect and unnecessary callback to setup_xprops which may have caused the pulseaudio flag to use the wrong value -- delay 'check packet size' to allow the limit to be raised - important over slower links where it triggers more easily v0.3.5 (2012-07-31) ====================== -- fix clipboard bugs -- robustify cython version string parsing -- fix source files changed detection during build v0.3.4 (2012-07-23) ====================== -- fix window size hints not applied -- fix free uninitialized pointers in error codepath -- fix crash with 1 pixel wide/high windows -- fix keyboard support for MS Windows and OSX clients -- explicitly include all icons -- handle invalid packets in the correct thread -- try harder to exit cleanly -- ensure all required attributes are set by the GUI launcher v0.3.3 (2012-07-10) ====================== -- do not try to free the empty x264/vpx buffers after a decompression failure -- fix xpra command exit code (zero) when no error occurred -- fix Xvfb deadlock on shutdown -- fix wrongly removing unix domain socket on startup failure -- fix wrongly killing Xvfb on startup failure -- fix race in network code and meta data packets -- ensure clients use raw_packets if the server supports it (fixes 'gibberish' compressed packet errors) -- fix screen resolution reported by the server -- fix maximum packet size check wrongly dropping valid connections -- honour the --no-tray command line argument -- detect Xvfb startup failures and avoid taking over other displays -- don't record invalid placeholder value for "server latency" -- fix missing "damage-sequence" packet for sequence zero -- fix window focus with some Tk based application (ie: git gui) -- prevent large clipboard packets from causing the connection to drop -- fix for connection with older clients and server without raw packet support and rgb24 encoding -- high latency fix: reduce batch delay when screen updates slow down -- non-US keyboard layout fix -- correctly calculate min_batch_delay shown in statistics via "xpra info" -- require x264-libs for x264 support on Fedora ################## unblock xpra/0.3.9+dfsg-2 Thank you. Regards, Dmitry.diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..1508b49 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,42 @@ +Xdummy +------ + +Using Xdummy allows Xpra to resize the virtual display to match the +client's resolution so as to prevent windows and menus from overflowing +beyond the edge of the screen. + +Sample xpra start command: + + xpra --xvfb="Xorg -dpi 96 -noreset -nolisten tcp \ + +extension GLX +extension RANDR +extension RENDER \ + -config /usr/share/doc/xpra/examples/dummy.xorg.conf \ + -logfile ${HOME}/.xpra/Xvfb-8.log" \ + --start-child="/etc/X11/Xsession true" \ + start :8 + +Note: '-noreset' option is only needed if the window manager is not the +first application started on the display, for instance if you use option +--start-child or if you want the display to survive once the window +manager exits - generally, this is a good idea since xpra could crash +and when it exits cleanly via "xpra stop" it takes care of shutting down +the X11 server anyway. + +Sample xorg.conf contains many of the most common resolutions you are +likely to need, including those found on phones and tablets. However if +your client uses unusual resolutions, for instance multiple screens of +differing sizes, you may need to add new Modelines to match your +specific resolution. + +See http://en.wikipedia.org/wiki/XFree86_Modeline + +Modelines can be generated by 'cvt' command line utility provided by +package 'xserver-xorg-core' or by using one of the following on-line +caclulators: for desirable screen resolution: + + http://www.arachnoid.com/modelines/ + http://xtiming.sourceforge.net/cgi-bin/xtiming.pl + +SEE ALSO + + https://www.xpra.org/Xdummy.html + diff --git a/debian/changelog b/debian/changelog index c1dd4d5..e4e65de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,67 @@ +xpra (0.3.9+dfsg-2) unstable; urgency=low + + * Override dh_compress to prevent compression of example conf file. + (Closes: #688235) + + -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Fri, 21 Sep 2012 07:43:42 +0200 + +xpra (0.3.9+dfsg-1) unstable; urgency=low + + [ أحمد المحمودي (Ahmed El-Mahmoudy) ] + * New upstream release. + * debian/README.Debian: Remove Known issues section, it is invalidated with + 0.3.6 release. + * debian/rules: Allow overriding of VER in get-orig-source. + + [ Dmitry Smirnov ] + * debian/rules: export LDFLAGS using DEB_LDFLAGS_MAINT_APPEND. + * debian/xpra.install: install only *.png icons. + * Remove debian/parti.* (we're not shipping parti). + * Publicly expose xpra modules. + + Dropped private-pkg.diff patch. + + debian/xpra.install: install xpra modules publicly. + * debian/watch: corrected version mangle (Closes: #674964) + * Removing debian/repack in favour of get-orig-source + * binary and source compression to xz: + + debian/rules: added override for dh_builddeb + + Added debian/source/options + * debian/copyright: add missing copyright paragraph. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Wed, 19 Sep 2012 13:45:58 +0200 + +xpra (0.3.6+dfsg-1) unstable; urgency=low + + [ أحمد المحمودي (Ahmed El-Mahmoudy) ] + * debian/control: Added Dmitry Smirnov to Uploaders + * New upstream release. (Closes: #683133) + + [ Dmitry Smirnov ] + * Remove debian/docs + * debian/copyright: + + Consolidated and updated copyright info. + + Update copyright format. + * debian/control: added Recommends: xserver-xorg-video-dummy + * debian/rules: avoid dropping LDFLAGS when passing --as-needed (fixes + Hardening) + * install sample 'dummy.xorg.conf' and README.Debian with instructions + how to use Xdummy (Closes: #681051). + * separating man pages from .install to .manpages + + -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Sat, 18 Aug 2012 17:57:15 +0200 + +xpra (0.3.4+dfsg-1) unstable; urgency=low + + * New upstream release. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Wed, 25 Jul 2012 10:03:25 +0200 + +xpra (0.3.3+dfsg-1) unstable; urgency=low + + * New upstream release. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Wed, 11 Jul 2012 16:57:20 +0200 + xpra (0.3.2+dfsg-1) unstable; urgency=low * New upstream release. * debian/xpra.install: Install xpra_launcher manpage. diff --git a/debian/control b/debian/control index 50e2876..dc75373 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,10 @@ Source: xpra Section: x11 Priority: optional Maintainer: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org> Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>, - Miguel Landaeta <miguel@miguel.cc> + Miguel Landaeta <miguel@miguel.cc>, + Dmitry Smirnov <onlyjob@member.fsf.org> Build-Depends: cython (>> 0.14.0), debhelper (>= 9), libavcodec-dev, libswscale-dev, @@ -33,8 +34,9 @@ Depends: ${misc:Depends}, python-gtk2, python-imaging, x11-xserver-utils, xvfb, +Recommends: xserver-xorg-video-dummy Suggests: openssh-client, openssh-server Description: tool to detach/reattach running X programs Xpra gives you the functionality of GNU Screen for X applications. . diff --git a/debian/copyright b/debian/copyright index 05bdd2a..d2d029c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,35 +1,18 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: xpra -Upstream-Contact: Antoine Martin <antoine@devloop.org.uk>, +Upstream-Contact: Antoine Martin <antoine@devloop.org.uk> Source: http://xpra.org/ Files: * Copyright: 2008-2010 Nathaniel Smith <njs@pobox.com> License: GPL-2+ Files: xpra/server.py xpra/scripts/main.py -Copyright: 2008 Nathaniel Smith <njs@pobox.com> - 2010-2011 Antoine Martin <antoine@devloop.org.uk> - 2011 Serviware (Arthur Huillet, <ahuillet@serviware.com>) -License: GPL-2+ - -Files: xpra/client.py -Copyright: 2008,2010 Nathaniel Smith <njs@pobox.com> - 2010-2011 Antoine Martin <antoine@devloop.org.uk> - 2011 Serviware (Arthur Huillet, <ahuillet@serviware.com>) -License: GPL-2+ - -Files: xpra/test_HMAC.py - xpra/darwin/gui.py - xpra/darwin/__init__.py - xpra/test_bencode.py -Copyright: 2011 Antoine Martin <antoine@devloop.org.uk> -License: GPL-2+ - -Files: xpra/scripts/client_launcher.py -Copyright: 2009-2011 Antoine Martin <antoine@devloop.org.uk> +Copyright: 2008-2010 Nathaniel Smith <njs@pobox.com> + 2009-2011 Antoine Martin <antoine@devloop.org.uk> + 2011-2012 Serviware (Arthur Huillet, <ahuillet@serviware.com>) License: GPL-2+ Files: parti/addons/ipython_view.py Copyright: 2007 IBM Corporation @@ -59,13 +42,43 @@ License: BSD CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Files: xpra/x264/win32/*.h + xpra/vpx/win32/*.h +Copyright: 2006-2008 Alexander Chemeris +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + 3. The name of the author may be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Files: debian/* Copyright: 2009 Evan Dandrea <evand@ubuntu.com> 2010 Michael Schutte <michi@uiae.at> + 2010 Matthias Klose <doko@ubuntu.com> 2010-2011 Miguel Landaeta <miguel@miguel.cc> - 2010-2011 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> + 2010-2012 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> + 2012 Dmitry Smirnov <onlyjob@member.fsf.org> License: GPL-2+ License: GPL-2+ This program is free software; you can redistribute it and/or modify diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e845566..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/debian/examples/dummy.xorg.conf b/debian/examples/dummy.xorg.conf new file mode 100644 index 0000000..8630045 --- /dev/null +++ b/debian/examples/dummy.xorg.conf @@ -0,0 +1,127 @@ +##Xdummy:## +Section "ServerFlags" + Option "DontVTSwitch" "true" + Option "AllowMouseOpenFail" "true" + Option "PciForceNone" "true" + Option "AutoEnableDevices" "false" + Option "AutoAddDevices" "false" +EndSection + + +##Xdummy:## +Section "InputDevice" + Identifier "NoMouse" + Option "CorePointer" "true" + Driver "void" +EndSection + +Section "InputDevice" + Identifier "NoKeyboard" + Option "CoreKeyboard" "true" + Driver "void" +EndSection + +##Xdummy:## +Section "Device" + Identifier "Videocard0" + Driver "dummy" + #VideoRam 4096000 + VideoRam 256000 +EndSection + +##Xdummy:## +Section "Monitor" + Identifier "Monitor0" + HorizSync 10.0 - 300.0 + VertRefresh 10.0 - 200.0 + DisplaySize 4335 1084 + #The following modeline is invalid (calculator overflowed): + #Modeline "32000x32000@0" -38917.43 32000 32032 -115848 -115816 32000 32775 32826 33601 + Modeline "16384x8192@10" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602 + Modeline "8192x4096@10" 424.46 8192 8224 9832 9864 4096 4195 4202 4301 + Modeline "5120x3200@10" 199.75 5120 5152 5904 5936 3200 3277 3283 3361 + Modeline "3840x2880@10" 133.43 3840 3872 4376 4408 2880 2950 2955 3025 + Modeline "3840x2560@10" 116.93 3840 3872 4312 4344 2560 2622 2627 2689 + Modeline "3840x2048@10" 91.45 3840 3872 4216 4248 2048 2097 2101 2151 + Modeline "2048x2048@10" 49.47 2048 2080 2264 2296 2048 2097 2101 2151 + Modeline "2560x1600@10" 47.12 2560 2592 2768 2800 1600 1639 1642 1681 + Modeline "1920x1200@10" 26.28 1920 1952 2048 2080 1200 1229 1231 1261 + Modeline "1920x1080@10" 23.53 1920 1952 2040 2072 1080 1106 1108 1135 + Modeline "1680x1050@10" 20.08 1680 1712 1784 1816 1050 1075 1077 1103 + Modeline "1600x900@20" 33.92 1600 1632 1760 1792 900 921 924 946 + Modeline "1440x900@20" 30.66 1440 1472 1584 1616 900 921 924 946 + Modeline "1360x768@20" 24.49 1360 1392 1480 1512 768 786 789 807 + #common resolutions for android devices (both orientations): + Modeline "800x1280@20" 25.89 800 832 928 960 1280 1310 1315 1345 + Modeline "1280x800@20" 24.15 1280 1312 1400 1432 800 819 822 841 + Modeline "720x1280@25" 30.22 720 752 864 896 1280 1309 1315 1345 + Modeline "1280x720@25" 27.41 1280 1312 1416 1448 720 737 740 757 + Modeline "768x1024@25" 24.93 768 800 888 920 1024 1047 1052 1076 + Modeline "1024x768@25" 23.77 1024 1056 1144 1176 768 785 789 807 + Modeline "600x1024@25" 19.90 600 632 704 736 1024 1047 1052 1076 + Modeline "1024x600@25" 18.26 1024 1056 1120 1152 600 614 617 631 + Modeline "536x960@25" 16.74 536 568 624 656 960 982 986 1009 + Modeline "960x536@25" 15.23 960 992 1048 1080 536 548 551 563 + Modeline "600x800@25" 15.17 600 632 688 720 800 818 822 841 + Modeline "800x600@25" 14.50 800 832 880 912 600 614 617 631 + Modeline "480x854@25" 13.34 480 512 560 592 854 873 877 897 + Modeline "848x480@25" 12.09 848 880 920 952 480 491 493 505 + Modeline "480x800@25" 12.43 480 512 552 584 800 818 822 841 + Modeline "800x480@25" 11.46 800 832 872 904 480 491 493 505 + Modeline "320x480@50" 10.73 320 352 392 424 480 490 494 505 + Modeline "480x320@50" 9.79 480 512 544 576 320 327 330 337 + Modeline "240x400@50" 6.96 240 272 296 328 400 408 412 421 + Modeline "400x240@50" 6.17 400 432 448 480 240 245 247 253 + Modeline "240x320@50" 5.47 240 272 288 320 320 327 330 337 + Modeline "320x240@50" 5.10 320 352 368 400 240 245 247 253 + #resolutions for android devices (both orientations) + #minus the status bar + #38px status bar (and width rounded up) + Modeline "800x1242@20" 25.03 800 832 920 952 1242 1271 1275 1305 + Modeline "1280x762@20" 22.93 1280 1312 1392 1424 762 780 783 801 + Modeline "720x1242@25" 29.20 720 752 856 888 1242 1271 1276 1305 + Modeline "1280x682@25" 25.85 1280 1312 1408 1440 682 698 701 717 + Modeline "768x986@25" 23.90 768 800 888 920 986 1009 1013 1036 + Modeline "1024x730@25" 22.50 1024 1056 1136 1168 730 747 750 767 + Modeline "600x986@25" 19.07 600 632 704 736 986 1009 1013 1036 + Modeline "1024x562@25" 17.03 1024 1056 1120 1152 562 575 578 591 + Modeline "536x922@25" 16.01 536 568 624 656 922 943 947 969 + Modeline "960x498@25" 14.09 960 992 1040 1072 498 509 511 523 + Modeline "600x762@25" 14.39 600 632 680 712 762 779 783 801 + Modeline "800x562@25" 13.52 800 832 880 912 562 575 578 591 + Modeline "480x810@25" 12.59 480 512 552 584 810 828 832 851 + Modeline "848x442@25" 11.09 848 880 920 952 442 452 454 465 + Modeline "480x762@25" 11.79 480 512 552 584 762 779 783 801 + Modeline "800x442@25" 10.51 800 832 864 896 442 452 454 465 + #32px status bar (no need for rounding): + Modeline "320x448@50" 9.93 320 352 384 416 448 457 461 471 + Modeline "480x288@50" 8.75 480 512 544 576 288 294 297 303 + #24px status bar: + Modeline "240x376@50" 6.49 240 272 296 328 376 384 387 395 + Modeline "400x216@50" 5.50 400 432 448 480 216 220 222 227 + Modeline "240x296@50" 5.02 240 272 288 320 296 302 305 311 + Modeline "320x216@50" 4.55 320 352 368 400 216 220 222 227 +EndSection + +##Xdummy:## +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" + DefaultDepth 24 + SubSection "Display" + Viewport 0 0 + Depth 24 + Modes "32000x32000" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200" + #Virtual 32000 32000 + #Virtual 16384 8192 + Virtual 8192 4096 + EndSubSection +EndSection + +Section "ServerLayout" + Identifier "dummy_layout" + Screen "screen0" + InputDevice "NoMouse" + InputDevice "NoKeyboard" +EndSection diff --git a/debian/parti.docs b/debian/parti.docs deleted file mode 100644 index 3592483..0000000 --- a/debian/parti.docs +++ /dev/null @@ -1 +0,0 @@ -README.parti diff --git a/debian/parti.install b/debian/parti.install deleted file mode 100644 index bc54a19..0000000 --- a/debian/parti.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/*/parti usr/lib/parti -usr/bin/parti* diff --git a/debian/parti.links b/debian/parti.links deleted file mode 100644 index ad36c2b..0000000 --- a/debian/parti.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/man/man1/parti.1 usr/share/man/man1/parti-repl.1 diff --git a/debian/parti.manpages b/debian/parti.manpages deleted file mode 100644 index 71b9335..0000000 --- a/debian/parti.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/parti.1 diff --git a/debian/patches/private-pkg.diff b/debian/patches/private-pkg.diff deleted file mode 100644 index 0d4aed7..0000000 --- a/debian/patches/private-pkg.diff +++ /dev/null @@ -1,44 +0,0 @@ -Description: Add /usr/lib/xpra to sys.path for xpra script and /usr/lib/parti - to sys.path for parti script. -Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> -Forwarded: not-needed ---- a/scripts/parti -+++ b/scripts/parti -@@ -1,6 +1,7 @@ - #!/usr/bin/env python - - import sys -+sys.path.append("/usr/lib/parti") - import parti.scripts.main - - parti.scripts.main.main(sys.argv) ---- a/scripts/parti-repl -+++ b/scripts/parti-repl -@@ -1,6 +1,7 @@ - #!/usr/bin/env python - - import sys -+sys.path.append("/usr/lib/parti") - import parti.scripts.repl - - parti.scripts.repl.main(sys.argv) ---- a/scripts/xpra -+++ b/scripts/xpra -@@ -1,6 +1,7 @@ - #!/usr/bin/env python - - import sys -+sys.path.append("/usr/lib/xpra") - 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() diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9a23cd6..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -private-pkg.diff diff --git a/debian/repack b/debian/repack deleted file mode 100755 index d69d13a..0000000 --- a/debian/repack +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash -- - -set -e - -VERSION=$2 -TARBALL="`readlink -f "$3"`" - -TMPDIR=`mktemp -d` - -cd "$TMPDIR" - -if [ -n "$VERBOSE" ]; then - echo "Repacking tarball $TARBALL" -fi - -if grep tar.gz$ <<< $TARBALL &>/dev/null; then - TYPE=gzip - tar zxf "$TARBALL" -elif grep tar.bz2$ <<< $TARBALL &>/dev/null; then - TYPE=bzip2 - tar jxf "$TARBALL" -elif grep zip$ <<< $TARBALL &>/dev/null; then - TYPE=zip - unzip -qq "$TARBALL" -else - echo "Do not know how to unpack $TARBALL (expecting tar.gz, tar.bz2 or zip)" -fi - -SUBDIR= -if [ "`ls -1 | wc -l`" = "1" ]; then - cd * - SUBDIR=true -fi - -rm -rf working-notes/specs/ - -if [ -n "$SUBDIR" ]; then - cd .. -fi - -rm -f "$TARBALL" - -case "$TYPE" in -gzip) - tar zcf "$TARBALL" * - ;; -bzip2) - tar jcf "$TARBALL" * - ;; -zip) - tar zcf "${TARBALL%.zip}.tar.gz" * - ;; -esac - -cd / -rm -rf "$TMPDIR" - -if [ -n "$VERBOSE" ]; then - echo "done" -fi diff --git a/debian/rules b/debian/rules index f51c920..40b8f89 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export LDFLAGS=-Wl,--as-needed +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed %: dh $@ --with python2 override_dh_auto_build: @@ -8,4 +8,36 @@ override_dh_auto_build: dh_auto_build override_dh_installchangelogs: dh_installchangelogs NEWS + +override_dh_compress: + dh_compress --exclude=.conf + +override_dh_builddeb: + dh_builddeb -- -Zxz + +PKG := xpra +DTYPE := +dfsg +DPATH := $(abspath $(dir $(MAKEFILE_LIST))) +VER ?= $(shell dpkg-parsechangelog -l$(DPATH)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+)}') +.PHONY: get-orig-source +get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz + @ + +$(PKG)_$(VER)$(DTYPE).orig.tar.xz: + @echo "# Downloading..." + uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(DPATH) + @echo "# Extracting..." + mkdir $(PKG)-$(VER) \ + && tar xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \ + || $(RM) -r $(PKG)-$(VER) + @echo "# Clean-up..." + cd $(PKG)-$(VER) \ + && $(RM) -r -v \ + */*.bmp \ + */.ico \ + */*.ico \ + working-notes/specs + @echo "# Packing..." + tar cJf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" "$(PKG)-$(VER)" \ + && $(RM) -r "$(PKG)-$(VER)" diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..b7bc1f2 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +compression = "xz" diff --git a/debian/watch b/debian/watch index bcb06c0..2293d51 100644 --- a/debian/watch +++ b/debian/watch @@ -1,7 +1,9 @@ +# uscan(1) configuration file. +# use "debian/rules get-orig-source" to get DFSG-repackaged orig.tar + version=3 -opts="uversionmangle=s/$/\+dfsg/," \ - http://winswitch.org/src/ xpra-(.*)\.tar\.bz2 \ - debian ./debian/repack +opts="dversionmangle=s/\+dfsg//" \ + http://winswitch.org/src/ xpra-(.*)\.tar\.(?:bz2|xz|gz) #http://code.google.com/p/partiwm/downloads/list \ # http://partiwm.googlecode.com/files/parti-all-(.*)\.tar\.gz \ diff --git a/debian/xpra.examples b/debian/xpra.examples new file mode 100644 index 0000000..55b78ae --- /dev/null +++ b/debian/xpra.examples @@ -0,0 +1 @@ +debian/examples/* diff --git a/debian/xpra.install b/debian/xpra.install index b151c1f..2c89c9b 100644 --- a/debian/xpra.install +++ b/debian/xpra.install @@ -1,7 +1,5 @@ -usr/lib/*/*/xpra usr/lib/xpra/ -usr/share/man/man1/xpra.1 -usr/share/man/man1/xpra_launcher.1 +usr/lib/*/*/xpra usr/bin/xpra usr/bin/xpra_launcher -usr/share/xpra/icons +usr/share/xpra/icons/*.png usr/share/applications diff --git a/debian/xpra.manpages b/debian/xpra.manpages new file mode 100644 index 0000000..800488e --- /dev/null +++ b/debian/xpra.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/xpra.1 +debian/tmp/usr/share/man/man1/xpra_launcher.1Attachment: signature.asc
Description: This is a digitally signed message part.
--- End Message ---
--- Begin Message ---
- To: Dmitry Smirnov <onlyjob@member.fsf.org>, 688729-done@bugs.debian.org
- Subject: Re: Bug#688729: unblock xpra/0.3.9+dfsg-2
- From: Julien Cristau <jcristau@debian.org>
- Date: Sat, 1 Dec 2012 13:46:44 +0100
- Message-id: <20121201124644.GN5634@radis.cristau.org>
- In-reply-to: <201209251541.52508.onlyjob@member.fsf.org>
- References: <201209251541.52508.onlyjob@member.fsf.org>
On Tue, Sep 25, 2012 at 15:41:47 +1000, Dmitry Smirnov wrote: > Package: release.debian.org > Severity: normal > User: release.debian.org@packages.debian.org > Usertags: unblock > > Please unblock package 'xpra' > Unblocked. Cheers, JulienAttachment: signature.asc
Description: Digital signature
--- End Message ---