Backport the contrib directory from trunk as well as our new build

system relies on it.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_3@5173 3789f03b-4d11-0410-bbf8-ca57d06f2519

contrib/packages/deb/ubuntu-precise/debian/changelog

@@ -0,0 +1,31 @@
+tigervnc (1.3.0-3ubuntu1) precise; urgency=low
+
+  * Build Xvnc against native upstream xorg sources, using native config
+    options. Use distro-specific fltk1.3 sources.
+
+ -- Brian P. Hinz <[email protected]>  Sun, 14 Jul 2013 15:22:28 -0400
+
+tigervnc (1.3.0-3) precise; urgency=low
+
+  * Additional dependencies (derived from ldd | dpkg -S).
+
+ -- Brian P. Hinz <[email protected]>  Sun, 07 Jul 2013 11:01:33 -0400
+
+tigervnc (1.3.0-2) precise; urgency=low
+
+  * Added build dependencies to improve font support in viewer.
+
+ -- Brian P. Hinz <[email protected]>  Sun, 07 Jul 2013 10:44:05 -0400
+
+tigervnc (1.3.0-1) precise; urgency=low
+
+  * Removed java viewer from server package. Fixed typo in server
+    dependencies.
+
+ -- Brian P. Hinz <[email protected]>  Sun, 07 Jul 2013 09:55:44 -0400
+
+tigervnc (1.3.0) precise; urgency=low
+
+  * Initial release.
+
+ -- Brian P. Hinz <[email protected]>  Fri, 05 Jul 2013 00:47:02 -0400

contrib/packages/deb/ubuntu-precise/debian/compat

@@ -0,0 +1 @@
+9

contrib/packages/deb/ubuntu-precise/debian/control

@@ -0,0 +1,70 @@
+Source: tigervnc
+Section: x11
+Priority: optional
+Maintainer: Brian P. Hinz <[email protected]>
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>> 7.1), zlib1g-dev, libjpeg-turbo8-dev, libxaw7-dev (>> 4.1.0), perl-modules, xfonts-base, xutils-dev, libx11-dev, libxau-dev, libxext-dev, libxi-dev, libxkbfile-dev, libxmu-dev, libxt-dev, x11proto-core-dev, cmake (>> 2.8), libgnutls-dev, libpam0g-dev, libpng-dev, automake, autoconf, libtool, pkg-config, libpixman-1-dev, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-damage-dev, x11proto-dri2-dev, x11proto-fixes-dev, x11proto-fonts-dev, x11proto-gl-dev, x11proto-input-dev, x11proto-kb-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86dri-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, x11proto-xinerama-dev, libosmesa6-dev, libgl1-mesa-dev, libgl1-mesa-dri, libgl1-mesa-glx, libxfont-dev, x11proto-record-dev, default-jdk, libxtst-dev, libxft-dev, libexpat1-dev, libfontconfig1-dev, libxrender-dev, libt1-dev, libpciaccess-dev, curl, bzip2, quilt
+Homepage: http://www.tigervnc.com
+
+Package: tigervncserver
+Architecture: amd64 i386
+Provides: xserver, vnc-server
+Depends: x11-common | xserver-common, x11-utils, xauth, libbz2-1.0, libc6, libfontenc1, libfreetype6, libgcc1, libgcrypt11, libgl1-mesa-dri, libgnutls26, libgpg-error0, libjpeg-turbo8, libp11-kit0, libpam0g, libpixman-1-0, libstdc++6, libtasn1-3, libx11-6, libxau6, libxcb1, libxdmcp6, libxext6, libxfont1, libxtst6, zlib1g
+Recommends: xfonts-base, x11-xserver-utils
+Suggests: xtigervncviewer, tigervnc-java
+Description: virtual network computing server software
+ Virtual Network Computing (VNC) is a remote display system which allows you to
+ view and interact with a virtual desktop environment that is running on another
+ computer on the network.  Using VNC, you can run graphical applications on a
+ remote machine and send only the display from these applications to your local
+ machine.  VNC is platform-independent and supports a wide variety of operating
+ systems and architectures as both servers and clients.
+ .
+ TigerVNC is a high-speed version of VNC based on the RealVNC 4 and X.org code
+ bases.  TigerVNC started as a next-generation development effort for TightVNC
+ on Unix and Linux platforms, but it split from its parent project in early 2009
+ so that TightVNC could focus on Windows platforms.  TigerVNC supports a variant
+ of Tight encoding that is greatly accelerated by the use of the libjpeg-turbo
+ JPEG codec.
+
+Package: xtigervncviewer
+Architecture: amd64 i386
+Provides: vncviewer, vnc-viewer
+Depends: libc6, libexpat1, libfontconfig1, libfreetype6, libgcc1, libgcrypt11, libgnutls26, libgpg-error0, libjpeg-turbo8, libp11-kit0, libpng12-0, libstdc++6, libtasn1-3, libx11-6, libxau6, libxcb1, libxdmcp6, libxext6, libxft2, libxrender1, zlib1g 
+Recommends: xfonts-base
+Suggests: tigervncserver, ssh
+Description: virtual network computing client software for X
+ Virtual Network Computing (VNC) is a remote display system which allows you to
+ view and interact with a virtual desktop environment that is running on another
+ computer on the network.  Using VNC, you can run graphical applications on a
+ remote machine and send only the display from these applications to your local
+ machine.  VNC is platform-independent and supports a wide variety of operating
+ systems and architectures as both servers and clients.
+ .
+ TigerVNC is a high-speed version of VNC based on the RealVNC 4 and X.org code
+ bases.  TigerVNC started as a next-generation development effort for TightVNC
+ on Unix and Linux platforms, but it split from its parent project in early 2009
+ so that TightVNC could focus on Windows platforms.  TigerVNC supports a variant
+ of Tight encoding that is greatly accelerated by the use of the libjpeg-turbo
+ JPEG codec.
+
+Package: tigervnc-java
+Architecture: any
+Suggests: tigervncserver
+Provides: vncviewer, vnc-viewer
+Depends:  default-jre
+Description: TigerVNC java applet
+ Virtual Network Computing (VNC) is a remote display system which allows you to
+ view and interact with a virtual desktop environment that is running on another
+ computer on the network.  Using VNC, you can run graphical applications on a
+ remote machine and send only the display from these applications to your local
+ machine.  VNC is platform-independent and supports a wide variety of operating
+ systems and architectures as both servers and clients.
+ .
+ TigerVNC is a high-speed version of VNC based on the RealVNC 4 and X.org code
+ bases.  TigerVNC started as a next-generation development effort for TightVNC
+ on Unix and Linux platforms, but it split from its parent project in early 2009
+ so that TightVNC could focus on Windows platforms.  TigerVNC supports a variant
+ of Tight encoding that is greatly accelerated by the use of the libjpeg-turbo
+ JPEG codec.
+

contrib/packages/deb/ubuntu-precise/debian/copyright

@@ -0,0 +1,116 @@
+This package was packaged for Debian by Brian P. Hinz <[email protected]>
+on Tue, 02 Jul 2013 21:33:24 +0500 using the tightvnc package as a base.
+
+It was downloaded from:
+	http://www.tigervnc.org/
+
+COPYRIGHT:
+==========
+
+TigerVNC is
+
+        Copyright (C) 1999 AT&T Laboratories Cambridge
+        Copyright (C) 2002-2005 RealVNC Ltd.
+        Copyright (C) 2000-2006 TightVNC Group
+        Copyright (C) 2005-2006 Martin Koegler
+        Copyright (C) 2005-2006 Sun Microsystems, Inc.
+        Copyright (C) 2006 OCCAM Financial Technology
+        Copyright (C) 2000-2008 Constantin Kaplinsky
+        Copyright (C) 2004-2009 Peter Astrand for Cendio AB
+        Copyright (C) 2010 Antoine Martin
+        Copyright (C) 2010 m-privacy GmbH
+        Copyright (C) 2009-2011 D. R. Commander
+        Copyright (C) 2009-2011 Pierre Ossman for Cendio AB
+        Copyright (C) 2004, 2009-2011 Red Hat, Inc.
+        Copyright (C) 2009-2011 TigerVNC Team
+        All Rights Reserved.
+
+This software is distributed under the GNU General Public Licence as published
+by the Free Software Foundation.  See the file LICENCE.TXT for the conditions
+under which this software is made available.  TigerVNC also contains code from
+other sources.  See the Acknowledgements section below, and the individual
+source files, for details of the conditions under which they are made
+available.
+
+ACKNOWLEDGEMENTS
+================
+
+This distribution contains zlib compression software.  This is:
+
+  Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  [email protected]          [email protected]
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+
+
+This distribution contains public domain DES software by Richard Outerbridge.
+This is:
+
+    Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge.
+    (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992.
+
+
+This distribution contains software from the X Window System.  This is:
+
+ Copyright 1987, 1988, 1998  The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of The Open Group shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from The Open Group.
+
+
+ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                         All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software and its 
+ documentation for any purpose and without fee is hereby granted, 
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in 
+ supporting documentation, and that the name of Digital not be
+ used in advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.  
+
+ DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.

contrib/packages/deb/ubuntu-precise/debian/get-orig-source.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+#curl -L -o tigervnc-1.3.0.tar.bz2 "http://downloads.sourceforge.net/project/tigervnc/tigervnc/1.3.0/tigervnc-1.3.0.tar.bz2"
+#tar xjf tigervnc-*.tar.bz2
+#rm tigervnc-*.tar.bz2
+curl -OL http://sourceforge.net/code-snapshots/svn/t/ti/tigervnc/code/tigervnc-code-5136-trunk.zip
+unzip tigervnc-code-*-trunk.zip
+mv tigervnc-code-*-trunk tigervnc-1.3.80
+rm tigervnc-code-*-trunk.zip
+pushd tigervnc-*
+curl -L -o fltk-1.3.2-source.tar.gz 'http://anonscm.debian.org/gitweb/?p=users/ucko/fltk1.3.git;a=snapshot;h=HEAD;sf=tgz'
+tar xzf fltk-*-source.tar.gz
+rm fltk-*-source.tar.gz
+mv fltk1.3-* fltk-1.3.2
+pushd fltk-*
+sh ../../debian/patch_fltk.sh
+find . -name "*.orig" -exec rm {} \;
+popd
+curl -L -o xorg-server-1.11.4-0ubuntu10.3.tar.gz 'http://anonscm.debian.org/gitweb/?p=pkg-xorg/xserver/xorg-server.git;a=snapshot;h=cbf435a091906484112f5c4cf35b17738e779ce9;sf=tgz'
+tar xzf xorg-server-*.tar.gz
+rm xorg-server-*.tar.gz
+pushd xorg-server-*
+QUILT_PATCHES=debian/patches quilt push -a
+popd
+cp -r xorg-server-*/* unix/xserver 
+rm -rf xorg-server-*
+pushd unix/xserver
+for all in `find . -type f -perm -001`; do
+        chmod -x "$all"
+done
+patch -p1 -b --suffix .vnc < ../xserver111.patch
+popd
+popd
+if [ -e tigervnc_1.3.80.orig.tar.gz ] ; then
+	rm tigervnc_1.3.80.orig.tar.gz
+fi
+tar czf tigervnc_1.3.80.orig.tar.gz tigervnc-1.3.80
+rm -rf tigervnc-1.3.80

contrib/packages/deb/ubuntu-precise/debian/local/vncserver.service

@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# Scripted by Maxim Heijndijk
+
+# chkconfig: 2345 91 35
+# description: Starts and stops vncserver. \
+# Used to provide remote X administration services.
+
+### BEGIN INIT INFO
+# Provides: vncservers
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Required-Start: networking
+# Required-Stop: networking
+# Short-Description: Starts and stops vncserver
+# Description: Used to provide remote X administration services.
+### END INIT INFO
+
+# Source function library.
+
+. /lib/lsb/init-functions
+
+VNCSERVERS=""
+
+[ -f /etc/default/vncservers ] && . /etc/default/vncservers || exit 0
+
+start() {
+
+    ulimit -S -c 0 >/dev/null 2>&1
+
+    RETVAL=0
+
+    for display in ${VNCSERVERS}; do
+
+	eval cd ~${display##*:}
+
+	if [ -e ".vnc/passwd" ]; then
+
+	    log_begin_msg "Starting VNC Server for user ${display##*:}:"
+
+	    unset BASH_ENV ENV
+
+	    su ${display##*:} -c "cd ~${display##*:} && vncserver :${display%%:*}"
+
+	    RETVAL="$?"
+
+	    if [ "$RETVAL" -ne 0 ]; then
+
+		log_end_msg 1
+
+		break
+
+	    else
+
+		log_end_msg 0
+
+	    fi
+
+	else
+
+	    log_begin_msg "Not starting VNC Server for user ${display##*:}.\n   File \"~${display##*:}/.vnc/passwd\" not found.\n   Create a password file for the VNC server with vncpasswd"
+
+	    log_end_msg 1
+
+	fi
+
+    done
+
+    [ "$RETVAL" -eq 0 ] && touch "/var/lock/vncserver"
+
+}
+
+stop() {
+
+    unset BASH_ENV ENV
+
+    for display in ${VNCSERVERS}; do
+
+	log_begin_msg "Shutting down VNC Server for user ${display##*:}: "
+
+	su ${display##*:} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1
+
+	RETVAL="$?"
+
+	[ "$RETVAL" -eq 0 ] && log_end_msg 0 || log_end_msg 1
+
+    done
+
+    [ -f "/var/lock/vncserver" ] && rm -f "/var/lock/vncserver"
+
+}
+
+case "$1" in
+
+    start)		start
+			;;
+
+    stop)		stop
+			;;
+
+    restart|reload)	stop
+			start
+			;;
+
+    *)			echo $"Usage: $0 {start|stop|restart}"
+			exit 1
+			;;
+
+esac
+
+exit 0

contrib/packages/deb/ubuntu-precise/debian/local/vncserver.sysconfig

@@ -0,0 +1,19 @@
+# The VNCSERVERS variable is a list of display:user pairs.
+#
+# Uncomment the lines below to start a VNC server on display :2
+# as my 'myusername' (adjust this to your own).  You will also
+# need to set a VNC password; run 'man vncpasswd' to see how
+# to do that.  
+#
+# DO NOT RUN THIS SERVICE if your local area network is
+# untrusted!  For a secure way of using VNC, see this URL:
+# http://kbase.redhat.com/faq/docs/DOC-7028
+
+# Use "-nolisten tcp" to prevent X connections to your VNC server via TCP.
+
+# Use "-localhost" to prevent remote VNC clients connecting except when
+# doing so through a secure tunnel.  See the "-via" option in the
+# `man vncviewer' manual page.
+
+# VNCSERVERS="2:myusername"
+# VNCSERVERARGS[2]="-geometry 800x600 -nolisten tcp -localhost"