Subversion Repositories x2vnc

Compare Revisions

Ignore whitespace Rev 16 → Rev 17

/tags/1.7.2-3/debian/watch
0,0 → 1,2
version=3
http://fredrik.hubbe.net/x2vnc.html x2vnc/x2vnc-(.*?)\.tar\.gz
/tags/1.7.2-3/debian/changelog
0,0 → 1,247
x2vnc (1.7.2-3) unstable; urgency=low
 
* Switch to source format 3.0 (quilt).
* Switch from Imake to configure (enabling Xinerama).
* Add patch via Ubuntu that fixes a problem with the cursor not moving
to the remote screen when Xinerama support is enabled (Closes:
#616396; LP: #726783). Thanks to Will Shackleton.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 06 Mar 2011 20:51:00 +0100
 
x2vnc (1.7.2-2) unstable; urgency=low
 
* New maintainer (Closes: #586422).
* Acknowledge NMU.
* debian/watch: Fix URL and regexp.
* Remove stale and commented-out references to /usr/X11R6 in
debian/rules. Delete debian/dirs altogether and drop the call to
dh_installdirs. Also clean out irrelevant, commented-out Debhelper
commands.
* Make the version in the debhelper build dependency match
debian/compat.
* Bump Standards-Version to 3.9.1 (from 3.6.2).
* A few minor style changes in debian/rules.
* debian/copyright: Remove outdated info on changes made to the upstream
source as well as current version, and update URL to upstream webpage.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 05 Aug 2010 10:34:21 +0200
 
x2vnc (1.7.2-1.1) unstable; urgency=low
 
* Non-maintainer upload.
* Correct build dependencies (Closes: #485529, #515411)
* Fix and upgrade watch file (Closes: #529147)
* Don't set DH_COMPAT in rules
* Don't ignore errors by make clean
* Bump compat level to six
* Convert the copyright file to UTF-8
 
-- Raphael Geissert <geissert@debian.org> Wed, 08 Jul 2009 15:31:37 -0500
 
x2vnc (1.7.2-1) unstable; urgency=low
 
* New upstream release.
Closes: #466290.
 
-- Ola Lundqvist <opal@debian.org> Tue, 25 Mar 2008 10:45:34 +0100
 
x2vnc (1.7.1-3) unstable; urgency=low
 
* Removed build dependency on libvncauth-dev.
* Removed suggests on vnc-common. Instead suggest vncservers and vncviewers.
 
-- Ola Lundqvist <opal@debian.org> Tue, 4 Mar 2008 18:38:58 +0100
 
x2vnc (1.7.1-2) unstable; urgency=low
 
* Made sure that it can compile even if the install target point it to
correct place, closes: #368506.
 
-- Ola Lundqvist <opal@debian.org> Mon, 29 May 2006 22:12:45 +0200
 
x2vnc (1.7.1-1) unstable; urgency=low
 
* New upstream release.
 
-- Ola Lundqvist <opal@debian.org> Mon, 22 May 2006 20:03:23 +0200
 
x2vnc (1.6.1-1) unstable; urgency=low
 
* New upstream release.
* Applied patch from Martin Dorey <martin.dorey@bluearc.com> to fix an
issue on amd64, closes: #343274.
 
-- Ola Lundqvist <opal@debian.org> Sat, 11 Mar 2006 17:30:13 +0100
 
x2vnc (1.6-4) unstable; urgency=low
 
* Maintainer upload, closes: #349108, #346786.
* Fixed typo in description, closes: #300047.
* Updated standards version to 3.6.2.
* Added listen option to manpage, closes: #317148.
Thanks to Rob Sims <debbugs-z@robsims.com> for the patch.
* Moved to debhelper 2 compatibility.
 
-- Ola Lundqvist <opal@debian.org> Sun, 29 Jan 2006 15:06:35 +0100
 
x2vnc (1.6-3.1) unstable; urgency=low
 
* Non-maintainer upload.
* Replace build-dependency on xlibs-dev with an explicit build-dependency
on each required package. (Closes: #346786)
 
-- Steinar H. Gunderson <sesse@debian.org> Sat, 21 Jan 2006 02:18:10 +0100
 
x2vnc (1.6-3) unstable; urgency=low
 
* Fixed package description, closes: #268549, #277241.
 
-- Ola Lundqvist <opal@debian.org> Sat, 25 Dec 2004 21:55:57 +0100
 
x2vnc (1.6-2) unstable; urgency=low
 
* Patched to make cut and paste work in KDE apps, closes: #191697.
Thanks to "Martin Dorey" <mdorey@bluearc.com> for the patch.
* Moved from /usr/X11R6 to /usr.
* Fixed manpage section error, 1x != x.
 
-- Ola Lundqvist <opal@debian.org> Thu, 26 Aug 2004 18:32:37 +0200
 
x2vnc (1.6-1) unstable; urgency=low
 
* New upstream release, closes: #233620.
This also fix a cut-and-paste bug, closes: #191697.
* Updated standards version to 3.6.1.
 
-- Ola Lundqvist <opal@debian.org> Wed, 28 Jul 2004 19:07:44 +0200
 
x2vnc (1.5.1-2) unstable; urgency=low
 
* Added build dependency on xlibs-dev, closes: #238618.
 
-- Ola Lundqvist <opal@debian.org> Sat, 20 Mar 2004 15:28:27 +0100
 
x2vnc (1.5.1-1) unstable; urgency=low
 
* New upstream version, closes: #205131, #160333, #206418.
* Updated standards version from 3.5.2 to 2.5.10.
 
-- Ola Lundqvist <opal@debian.org> Sun, 31 Aug 2003 15:59:27 +0200
 
x2vnc (1.4-2) unstable; urgency=low
 
* Changed from xlib6g-dev to libxaw7-dev, closes: #170180.
 
-- Ola Lundqvist <opal@debian.org> Fri, 22 Nov 2002 08:26:03 +0100
 
x2vnc (1.4-1) unstable; urgency=low
 
* New upstream version, closes: #148341.
 
-- Ola Lundqvist <opal@debian.org> Thu, 29 Aug 2002 07:27:49 +0200
 
x2vnc (1.3-1) unstable; urgency=low
 
* New upstream version, closes: #123688, #120473.
* Updated standards version.
* Removed depricated dh_testversion.
 
-- Ola Lundqvist <opal@debian.org> Wed, 3 Apr 2002 22:37:07 +0200
 
x2vnc (1.2-2) unstable; urgency=low
 
* The upstream wheel patch scrolled up when scrolling down and
vice vera. Fixed with patch by Evan Martin <eeyem@u.washington.edu>,
closes: #90142.
 
-- Ola Lundqvist <opal@debian.org> Mon, 19 Mar 2001 22:13:32 +0100
 
x2vnc (1.2-1) unstable; urgency=low
 
* New upstream version with mouse wheel support built in. Hope that
it works equally good or better than the patches I have applied.
 
-- Ola Lundqvist <opal@debian.org> Wed, 14 Mar 2001 15:45:35 +0100
 
x2vnc (1.1-6) unstable; urgency=low
 
* Added a patch from Evan Martin <eeyem@u.washington.edu> that fixes
issues with the wheel patch, closes: Bug#88716.
 
-- Ola Lundqvist <opal@debian.org> Thu, 22 Feb 2001 22:44:12 +0100
 
x2vnc (1.1-5) unstable; urgency=low
 
* Added xutils to build depends, closes: Bug#86586.
 
-- Ola Lundqvist <opal@debian.org> Thu, 22 Feb 2001 22:44:12 +0100
 
x2vnc (1.1-4) unstable; urgency=low
 
* Added suggestion of vnc-common, closes: Bug#81576.
 
-- Ola Lundqvist <opal@debian.org> Fri, 2 Feb 2001 13:03:46 +0100
 
x2vnc (1.1-3) unstable; urgency=low
 
* Readded dh_testversion and added a versioned debhelper dependency in the
control file as it really should be, closes: Bug#78573.
-- Ola Lundqvist <opal@debian.org> Sun, 3 Dec 2000 23:40:34 +0100
 
x2vnc (1.1-2) unstable; urgency=low
 
* Recompiled to indicate new maintainer and to make sure that it
works with the new c library.
* Have also applied the x2vnc-wheel-patch (found on freshmeat).
* Removed dh_testversion that lintian complains about from the
debian/rules file.
-- Ola Lundqvist <opal@debian.org> Tue, 21 Nov 2000 23:16:10 +0100
 
x2vnc (1.1-1) unstable; urgency=low
 
* New upstream release
 
-- Edward Betts <edward@debian.org> Sun, 21 May 2000 13:10:44 +0100
 
x2vnc (1.0-5) unstable; urgency=low
 
* Imakefile: modified to compile against libvncauth0
* debian/control: updateded Standards-Version to 3.1.1
* debian/control: added Build-Depends.
* debian/rules: rewritten.
* debian/rules: added xmkmf.
 
-- Edward Betts <edward@debian.org> Thu, 6 Jan 2000 23:59:45 +0000
 
x2vnc (1.0-4) unstable; urgency=low
 
* Changed to Debhelper 2.0
* Updated Standards-Version: 3.0.1
* Lintian clean
* Changed location of GPL to /usr/share/common-licenses/GPL
 
-- Edward Betts <edward@debian.org> Sun, 12 Sep 1999 12:01:26 +0100
 
x2vnc (1.0-3) unstable; urgency=low
 
* Corrected spelling of maintainers name in control (oops!)
* Passes Lintian v0.9.5
 
-- Edward Betts <edward@debian.org> Sun, 12 Sep 1999 12:01:15 +0100
 
x2vnc (1.0-2) unstable; urgency=low
 
* Improve man page
* Fixed source packaging - now includes pristine source
 
-- Edward Betts <edward@debian.org> Sun, 6 Dec 1998 11:44:48 +0000
 
x2vnc (1.0-1) unstable; urgency=low
 
* Initial Release
* Wrote a man page for x2vnc
* Passes Lintian v0.9.4
 
-- Edward Betts <edward@debian.org> Fri, 4 Dec 1998 14:25:08 +0000
/tags/1.7.2-3/debian/patches/series
0,0 → 1,0
multiscreen-cursor-stick.patch
/tags/1.7.2-3/debian/patches/multiscreen-cursor-stick.patch
0,0 → 1,24
Description: Fix a sticking cursor in a multi-screen configuration
When x2vnc is compiled with Xinerama support and runs with a multiscreen setup,
the cursor can become stuck on the border between the local and remote screens,
not moving further than the border, as it should do.
Author: Will Shackleton <w.shackleton@gmail.com>
Bug-Debian: http://bugs.debian.org/616396
Bug-Ubuntu: https://launchpad.net/bugs/726783
Forwarded: yes
 
--- a/x.c 2008-03-25 10:45:34 +0000
+++ b/x.c 2011-03-03 23:34:29 +0000
@@ -848,9 +848,9 @@
{
int n,ret=a.x;
if(a.y < ret) ret=a.y;
- n=displayHeight - a.y;
+ n=y_offset + displayHeight - a.y;
if(n < ret) ret=n;
- n=displayWidth - a.x;
+ n=x_offset + displayWidth - a.x;
if(n < ret) ret=n;
return ret;
}
 
/tags/1.7.2-3/debian/copyright
0,0 → 1,27
x2vnc was Written by Fredrik Hübinette <hubbe@hubbe.net>
Based on ideas from x2x and code from vncviewer.
 
It was packaged for use with Debian GNU/Linux by
Edward Betts <edward@debian.org>
 
The x2vnc-wheel-patch was applied by the new maintainer Ola Lundqvist
<opal@debian.org>. This patch was written by bryan d. berg <km@underworld.net>
and found on freshmeat: http://freshmeat.net/projects/x2vnc-wheel-patch/
 
The latest version of this program should be available from
 
http://fredrik.hubbe.net/x2vnc.html
 
For more info about VNC: http://www.uk.research.att.com/vnc/
For more info about x2x: http://ftp.digital.com/pub/Digital/SRC/x2x/
 
The code is:
Copyright (C) 1997, 1998 Olivetti & Oracle Research Laboratory
 
This is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
 
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
/tags/1.7.2-3/debian/rules
0,0 → 1,70
#!/usr/bin/make -f
# debian/rules for freesweep
# modifications by Edward Betts <edward@debian.org>
# Based on:
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
 
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
 
# This has to be exported to make some magic below work.
export DH_OPTIONS
 
config-stamp: configure
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man
touch config-stamp
 
build: build-stamp
build-stamp: config-stamp
dh_testdir
 
$(MAKE)
 
touch build-stamp
 
clean:
dh_testdir
dh_testroot
rm -f build-stamp
 
[ ! -f Makefile ] || $(MAKE) clean
 
dh_clean config-stamp Makefile config.status config.log config.cache
 
install: build
dh_testdir
dh_testroot
dh_clean -k
 
install -m 755 -d $(CURDIR)/debian/x2vnc/usr/share
$(MAKE) DESTDIR=$(CURDIR)/debian/x2vnc install
 
# Build architecture-independent files here.
binary-indep:
# We have nothing to do by default.
 
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs
dh_installexamples
dh_installmenu
# dh_installmanpages
dh_installchangelogs
dh_link
dh_strip
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
 
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/1.7.2-3/debian/control
===================================================================
--- tags/1.7.2-3/debian/control (nonexistent)
+++ tags/1.7.2-3/debian/control (revision 17)
@@ -0,0 +1,18 @@
+Source: x2vnc
+Section: x11
+Priority: optional
+Maintainer: Magnus Holmgren <holmgren@debian.org>
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 6), libxaw7-dev, xutils-dev, libx11-dev, libxinerama-dev, libxss-dev
+Homepage: http://fredrik.hubbe.net/x2vnc.html
+
+Package: x2vnc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: vnc4server, xvnc4viewer, tightvncserver, xtightvncviewer
+Description: A dual-screen hack - link an MS-Windows and X display
+ This program merges the capabilities of x2x and vncviewer. It will allow a
+ machine with an X display and a machine with a VNC server running on its main
+ screen to act as if they were two displays connected to one machine. When you
+ move your mouse pointer off the screen in a direction of your choosing, the
+ pointer will appear on the other screen instead.
Index: tags/1.7.2-3/debian/source/format
===================================================================
--- tags/1.7.2-3/debian/source/format (nonexistent)
+++ tags/1.7.2-3/debian/source/format (revision 17)
@@ -0,0 +1 @@
+3.0 (quilt)
Index: tags/1.7.2-3/debian/compat
===================================================================
--- tags/1.7.2-3/debian/compat (nonexistent)
+++ tags/1.7.2-3/debian/compat (revision 17)
@@ -0,0 +1 @@
+6
Index: tags/1.7.2-3/debian/docs
===================================================================
--- tags/1.7.2-3/debian/docs (nonexistent)
+++ tags/1.7.2-3/debian/docs (revision 17)
@@ -0,0 +1 @@
+README
Index: tags/1.7.2-3/debian
===================================================================
--- tags/1.7.2-3/debian (nonexistent)
+++ tags/1.7.2-3/debian (revision 17)
/tags/1.7.2-3/debian
Property changes:
Added: mergeWithUpstream
## -0,0 +1 ##
+1
\ No newline at end of property
Index: tags/1.7.2-3/x2vnc.man
===================================================================
--- tags/1.7.2-3/x2vnc.man (nonexistent)
+++ tags/1.7.2-3/x2vnc.man (revision 17)
@@ -0,0 +1,285 @@
+.TH x2vnc 1
+.SH NAME
+x2vnc \- a dual-screen hack
+
+.SH SYNOPSIS
+.B x2vnc
+.I <options>
+.I <host>:<display#>
+.br
+.B x2vnc
+.I <options>
+.I -listen
+.I [<display#>]
+.br
+[
+.B \-display
+.I display
+]
+.br
+[
+.B -version
+]
+.br
+[
+.B -shared
+]
+.br
+[
+.B -north
+] [
+.B -south
+] [
+.B -east
+] [
+.B -west
+]
+.br
+[
+.B -hotkey
+.I key
+]
+.br
+[
+.B -passwdfile
+.I passwd-file
+]
+.br
+[
+.B -resurface
+]
+.br
+[
+.B -edgewidth
+.I width
+]
+.br
+[
+.B -desktop
+.I desktop-number
+]
+.br
+[
+.B -timeout
+.I seconds
+]
+.br
+[
+.B -wheelhack
+]
+.br
+[
+.B -nowheel
+]
+.br
+[
+.B -reversewheel
+]
+.br
+[
+.B -scrolllines
+.I lines
+]
+.br
+[
+.B -navhack
+]
+.br
+[
+.B -mac
+]
+.br
+[
+.B -trimsel
+]
+.br
+[
+.B -noblank
+]
+.br
+[
+.B -lockdelay
+.I seconds
+]
+.br
+[
+.B -debug
+]
+.br
+[
+.B -accel
+.I multiplier
+]
+.br
+[
+.B -noreconnect
+]
+.br
+[
+.B -tunnel
+]
+.br
+[
+.B -via
+.I host
+]
+.SH DESCRIPTION
+.I x2vnc
+will let you use two screens on two different computers as if they were
+connected to the same computer. The computer with the 'main' keyboard must
+be running X-window, and the second computer should have a VNC server
+running which will update the contents on the actual screen. This means
+\fIXvnc\fR is not suitable, but \fIWinVNC\fR is.
+
+In listen mode (
+.B -listen
+option specified )
+.I x2vnc
+will wait for a connection from a VNC server on ports 5400 and 5500 (plus
+the optional
+.I display#
+value) instead of connecting to a specified VNC server.
+
+For up-to-date information on x2vnc, see the x2vnc home page:
+.B http://fredrik.hubbe.net/x2vnc.html
+
+.TP
+\fB\-display\fR \fIdisplay\fR
+The X windows display to connect from.
+.TP
+\fB\-shared\fR
+Allow multiple connections to the same VNC server.
+.TP
+\fB\-north\fR, \fB\-south\fR, \fB\-east\fR, \fB\-west\fR,
+Determine which edge leads to the other screen.
+.TP
+\fB\-passwdfile\fR \fIpassword-file\fR
+With this option you can start x2vnc without entering a password. The file is
+created by \fBvncpasswd\fR which comes with the X-windows VNC software.
+If the file does not exist, \fIx2vnc\fR will ask for a password and
+create the file.
+.TP
+\fB\-resurface\fR
+This option will cause the trigger window to re-surface automatically if it is
+covered up by another window.
+.TP
+\fB\-hotkey\fR \fIkey\fR
+This option allows you to select which key to use to warp the pointer
+to and from second computer. The default is "Control-F12", any
+combination of modifiers can be used, such as "shift-alt-meta-ctrl-F1"
+(or s-a-m-c-F1).
+.TP
+\fB\-edgewidth\fR \fIpixels\fR
+This is a workaround for some X servers which do not allow the mouse to
+go all the way to the edge of the screen. By setting this to 2 or greater, the
+mouse will be able to reach the x2vnc window and thus warp to the
+windows machine. The default value is 1. If you set this value to 0,
+no border will be generated, which means you will have to use hotkeys
+to switch to the oher screen.
+.TP
+\fB\-desktop\fR \fIdesktop-number\fR
+With this option, you can make x2vnc non-sticky. This may not work
+with all window-managers. Note that the first desktop is usually
+0 (zero). If you want x2vnc to appear on the last (rightmost) desktop,
+use -1. This option was especially created with the sawfish edgeflipping
+in mind, normally you would use "-west -desktop 0" or "-east -destkop -1"
+with Sawfish to allow edgeflipping to work normally.
+.TP
+\fB\-timeout\fR \fIseconds\fR
+This options tells x2vnc how long to wait before warping the cursor back
+to the X screen if there is no activity. The reason for this is that
+some screen savers, such as xscreensaver, cannot activate while x2vnc is
+in control of the cursor. The default value is 590 seconds, which is
+equivalent to 9 minutes and 50 seconds. Using a value of 0 will disable
+timeouts completely.
+.TP
+\fB\-nowheel\fR
+This option does nothing and is left for backwards compatibility only.
+.TP
+\fB\-wheelhack\fR
+This will make x2vnc tranlate all mouse wheel events into arrow up/down
+events. Only use this if your VNC server doesn't understand mouse wheel
+events.
+.TP
+\fB\-reversewheel\fR
+Invert the up/down direction of the mouse wheel emulation.
+This option only works if -wheelhack is used.
+.TP
+\fB\-scrolllines\fR \fIlines\fR
+When using mouse wheel emulation, this selects how many up/down
+events will be sent for each tick of the mouse wheel.
+.TP
+\fB\-navhack\fR
+This will map button 6 & 7 to Alt+Left/Right, which will allow the
+navigation buttons on some mice to behave more like they do in windows.
+.TP
+\fB\-mac\fR
+Macintosh specific mode, maps second mouse button to control-mouseclick.
+.TP
+\fB\-trimsel\fR
+If the X selection looks like a URL, trim leading and trailing spaces.
+This can be useful for pasting URLs into a browser.
+.TP
+\fB\-noblank\fR
+Prevent screen blanking on the remote desktop while you are working
+on the local desktop. Requires the MIT-SCREEN-SAVER or XIDLE extension
+to work properly. If neither of these extensions are present, the
+remote desktop will always be kept from blanking.
+.TP
+\fB\-lockdelay\fR \fIseconds\fR
+This is only meaningful when using the -noblank option. When this
+option is present. With this option, x2vnc will not attempt to
+wake up the remote screen if you have been idle for more than
+the specified amount of time. This is useful if you need a password
+to unlock the remote screen and would rather leave it blanked until
+you need it.
+.TP
+\fB\-debug\fR
+This option will make x2vnc print out information about events it
+sends and receives to stderr for debugging purposes.
+.TP
+\fB\-accel\fR \fImultiplier\fR
+This option allows you to control the speed of the mouse on the
+remote screen. 2.0 means twice as fast, 0.5 means half as fast.
+Default is 1.0. Note that this is multiplied with a number which
+x2vnc calculates based on screen sizes and other factors.
+.TP
+\fB\-noreconnect\fR
+This option prevents x2vnc from automatically reconnecting if the
+connection is closed.
+.TP
+\fB\-tunnel\fR
+This option makes x2vnc start an SSH tunnel to the machine being
+controlled by x2vnc. The SSH command used can be changed by setting
+the X2VNC_SSH_CMD environment variable. The default is:
+.br
+\fBssh -A -X -f -L "$LOCALPORT:$REMOTEHOST:$REMOTEPORT" \\
+.br
+"$GATEWAYHOST" 'ssh-add;sleep 60'\fR
+.TP
+\fB\-via\fR \fIhost\fR
+This is similar to -tunnel, but tunnels through a host different than
+the machine being controlled by x2vnc.
+
+
+.SH EXAMPLES
+Most common usage:
+.br
+\fBx2vnc -passwdfile $HOME/.vncpasswd -resurface host:0\fR
+
+To make x2vnc start (and re-start) automatically, add the following to
+your your X startup file (usually .xinitrc):
+.br
+\fB
+while :;
+.br
+do
+ x2vnc -passwd $HOME/.vncpasswd -resurface host:0
+.br
+ sleep 2
+.br
+done
+\fR
+
+.SH AUTHOR
+Fredrik Hübinette, hubbe@hubbe.net