Subversion Repositories x2vnc

Compare Revisions

Ignore whitespace Rev 3 → Rev 24

/tags/1.7.2-4/x2vnc.man
File deleted
/tags/1.7.2-4/debian/dirs
File deleted
/tags/1.7.2-4/debian/control
1,9 → 1,10
Source: x2vnc
Section: x11
Priority: optional
Maintainer: Ola Lundqvist <opal@debian.org>
Standards-Version: 3.6.2
Build-Depends: debhelper (>= 4.0.0), libxaw7-dev, xutils-dev, libx11-dev, libxinerama-dev, libxss-dev
Maintainer: Magnus Holmgren <holmgren@debian.org>
Standards-Version: 3.9.3
Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 6), libxaw7-dev,
xutils-dev, libx11-dev, libxinerama-dev, libxss-dev
Homepage: http://fredrik.hubbe.net/x2vnc.html
 
Package: x2vnc
10,7 → 11,7
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: vnc4server, xvnc4viewer, tightvncserver, xtightvncviewer
Description: A dual-screen hack - link an MS-Windows and X display
Description: Link a VNC and and an X display together, simulating a multiheaded 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
/tags/1.7.2-4/debian/source/format
0,0 → 1,0
3.0 (quilt)
/tags/1.7.2-4/debian/watch
1,2 → 1,2
version=3
http://fredrik.hubbe.net/x2vnc/x2vnc-\(.*\)\.tar\.gz debian uupdate
http://fredrik.hubbe.net/x2vnc.html x2vnc/x2vnc-(.*?)\.tar\.gz
/tags/1.7.2-4/debian/changelog
1,3 → 1,44
x2vnc (1.7.2-4) unstable; urgency=low
 
* man-listen.patch: Create proper patch of "Added listen option to
manpage" from 1.6-4.
* format-security.patch (new): Fix incorrect use of fprintf() (it
probably wasn't too dangerous as it was only argv[0] that was used as
a format string).
* debian/rules: Use dpkg-architecture and dpkg-buildflags.
* debian/rules: Add build-arch and build-indep targets.
* Bump Standards-Version to 3.9.3.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 23 Jun 2012 17:07:10 +0200
 
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.
/tags/1.7.2-4/debian/patches/series
0,0 → 1,3
multiscreen-cursor-stick.patch
man-listen.patch
format-security.patch
/tags/1.7.2-4/debian/patches/format-security.patch
0,0 → 1,97
Description: Fix incorrect use of fprintf()
Author: Magnus Holmgren <holmgren@debian.org>
 
--- a/sockets.c
+++ b/sockets.c
@@ -50,7 +50,7 @@ ReadExact(int sock, char *buf, int n)
j = read(sock, buf + i, (n - i));
if (j <= 0) {
if (j < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": read");
} else {
if (errorMessageFromReadExact) {
@@ -81,7 +81,7 @@ WriteExact(int sock, char *buf, int n)
j = write(sock, buf + i, (n - i));
if (j <= 0) {
if (j < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": write");
} else {
fprintf(stderr,"%s: write failed\n",programName);
@@ -126,20 +126,20 @@ ConnectToTcpAddr(unsigned int host, int
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": ConnectToTcpAddr: socket");
return -1;
}
if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": ConnectToTcpAddr: connect");
close(sock);
return -1;
}
if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)&one, sizeof(one)) < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": ConnectToTcpAddr: setsockopt");
close(sock);
return -1;
@@ -167,28 +167,28 @@ ListenAtTcpPort(int port)
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": ListenAtTcpPort: socket");
return -1;
}
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
(const char *)&one, sizeof(one)) < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": ListenAtTcpPort: setsockopt");
close(sock);
return -1;
}
if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": ListenAtTcpPort: bind");
close(sock);
return -1;
}
if (listen(sock, 5) < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": ListenAtTcpPort: listen");
close(sock);
return -1;
@@ -244,14 +244,14 @@ AcceptTcpConnection(int listenSock)
sock = accept(listenSock, (struct sockaddr *) &addr, &addrlen);
if (sock < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": AcceptTcpConnection: accept");
return -1;
}
if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
(char *)&one, sizeof(one)) < 0) {
- fprintf(stderr,programName);
+ fprintf(stderr,"%s",programName);
perror(": AcceptTcpConnection: setsockopt");
close(sock);
return -1;
/tags/1.7.2-4/debian/patches/man-listen.patch
0,0 → 1,36
Bug-Debian: http://bugs.debian.org/317148
Description: Add listen option to manpage
Author: Rob Sims <debbugs-z@robsims.com>
 
--- x2vnc-1.7.2.orig/x2vnc.man
+++ x2vnc-1.7.2/x2vnc.man
@@ -5,7 +5,12 @@ x2vnc \- a dual-screen hack
.SH SYNOPSIS
.B x2vnc
.I <options>
-.I host:0
+.I <host>:<display#>
+.br
+.B x2vnc
+.I <options>
+.I -listen
+.I [<display#>]
.br
[
.B \-display
@@ -126,6 +131,15 @@ be running X-window, and the second comp
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
/tags/1.7.2-4/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-4/debian/copyright
10,17 → 10,11
 
The latest version of this program should be available from
 
http://www.hubbe.net/~hubbe/x2vnc.html
http://fredrik.hubbe.net/x2vnc.html
 
The current version is http://www.hubbe.net/~hubbe/x2vnc-1.1.tar.gz
 
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 main changes to the package are the addition of Debian packaging
and changing x2vnc so it links dynamically rather than statically
with libvncauth.
 
The code is:
Copyright (C) 1997, 1998 Olivetti & Oracle Research Laboratory
 
/tags/1.7.2-4/debian/rules
8,15 → 8,29
# 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
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
build: build-stamp
build-stamp:
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
buildflags = --build=$(DEB_BUILD_GNU_TYPE)
else
buildflags = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
 
config-stamp: configure
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
$(shell dpkg-buildflags --export=configure)
touch config-stamp
 
xmkmf
#$(MAKE) x2vnc
build: build-arch
build-indep:
build-arch: build-stamp
build-stamp: config-stamp
dh_testdir
 
$(MAKE)
 
touch build-stamp
28,29 → 42,18
 
[ ! -f Makefile ] || $(MAKE) clean
 
dh_clean Makefile
dh_clean config-stamp Makefile config.status config.log config.cache
 
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
 
#install -o root -g root -m 755 x2vnc \
# `pwd`/debian/x2vnc/usr/X11R6/bin
$(MAKE) DESTDIR=`pwd`/debian/x2vnc install
#mkdir -p debian/x2vnc/usr/X11R6/bin
#-mv debian/x2vnc/usr/X11R6/bin/* debian/x2vnc/usr/bin
#mkdir -p debian/x2vnc/usr/share/man
#-mv debian/x2vnc/usr/X11R6/man/* debian/x2vnc/usr/share/man
-rmdir debian/x2vnc/usr/X11R6/bin
#-rmdir debian/x2vnc/usr/X11R6/man
-rmdir debian/x2vnc/usr/X11R6
mv debian/x2vnc/usr/share/man/man1/x2vnc.1x \
debian/x2vnc/usr/share/man/man1/x2vnc.1
install -m 755 -d $(CURDIR)/debian/x2vnc/usr/share
$(MAKE) DESTDIR=$(CURDIR)/debian/x2vnc install
 
# Build architecture-independent files here.
binary-indep: build install
binary-indep:
# We have nothing to do by default.
 
# Build architecture-dependent files here.
57,26 → 60,16
binary-arch: build install
dh_testdir
dh_testroot
# dh_installdebconf
dh_installdocs
dh_installexamples
dh_installmenu
# dh_installemacsen
# dh_installpam
# dh_installmime
# dh_installinit
# dh_installcron
# dh_installmanpages
# dh_installinfo
# dh_undocumented
dh_installchangelogs
dh_link
dh_strip
dh_compress
dh_fixperms
# dh_makeshlibs
dh_installdeb
# dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
83,4 → 76,4
dh_builddeb
 
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install