Unix scripts and docs in the root directory merged with VNC 4.1.1 (for the most part...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/merge-with-vnc-4.1.1@532 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/README b/README
index 73efd2b5985482de46437632577065d7df2f4649..77871721dfd4e31de3f3425e3a7c9c4434321459 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 TightVNC Source Distribution for Unix platforms
 ===============================================
 
-Copyright (C) 2002-2004 RealVNC Ltd.  All Rights Reserved.
+Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
 Copyright (C) 2000-2004 Constantin Kaplinsky.
 Copyright (C) 2004-2005 Peter Astrand, Cendio AB
 

diff --git a/configure.in b/configure.in
index 73e0223bea06dcf082fda5d331c65ee87da143b9..9b58f275ce733d30afd0751887a4e0be30c5444e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(rdr/InStream.h)
+AC_INIT(vncviewer_unix/vncviewer.cxx)
 
 PACKAGE=tightvnc
 VERSION=1.5.0

diff --git a/vncinstall b/vncinstall
index e5ab0172482170091d277ad03db0ebf4074ef50e..ad5dd8382cc81f0a243bc1226ad1a3b8d4034010 100755 (executable)
--- a/vncinstall
+++ b/vncinstall
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Copyright (C) 2002-2003 RealVNC Ltd.
+#  Copyright (C) 2002-2005 RealVNC Ltd.
 #
 #  This is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -58,7 +58,6 @@ fi
 
 for f in xc/programs/Xserver/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \
         vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do
-
   if [ ! -f $f ]; then
     echo "Couldn't find $f"
   else

diff --git a/vncserver b/vncserver
index 19333cb811d7e29ad987fa9943d21f90974877f3..16fe54a29c48e21fe013c554313962a5b34c84b9 100755 (executable)
--- a/vncserver
+++ b/vncserver
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
-#  Copyright (C) 2002-2003 RealVNC Ltd.
+#  Copyright (C) 2002-2005 RealVNC Ltd.
 #  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
 #
 #  This is free software; you can redistribute it and/or modify

diff --git a/vncserver.man b/vncserver.man
index 12f0656bd89b97706a82156c880a60026004de46..9eb88ec0b9d1eab99082ee1931ebd0f12112c8df 100644 (file)
--- a/vncserver.man
+++ b/vncserver.man
@@ -1,4 +1,4 @@
-.TH vncserver 1 "18 May 2004" "TightVNC" "Virtual Network Computing"
+.TH vncserver 1 "17 Apr 2006" "TightVNC" "Virtual Network Computing"
 .SH NAME
 vncserver \- start or stop a VNC server
 .SH SYNOPSIS

diff --git a/xc.patch b/xc.patch
index fc0f41f2c8d12c3895a5ae4a217b0aab8587faef..a5927b956466c2c37c2eb97b7d5db004b975fae9 100644 (file)
--- a/xc.patch
+++ b/xc.patch
@@ -34,7 +34,7 @@ diff -bcr xc.org/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
 + XVNCOBJS = $(XVNCDDXDIR)/stubs.o $(XVNCDDXDIR)/miinitext.o
 + XVNCSYSLIBS = $(FONTLIBS) $(SYSLIBS)
 + ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS), \
-+      $(XVNCLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XVNCSYSLIBS))
++      $(LIBCWRAPPER) $(XVNCLIBS) $(LOADABLEEXTS),$(XVNCSYSLIBS))
   
   
   #if defined(Xsun24Server) && Xsun24Server