Revision: 5183
http://sourceforge.net/p/tigervnc/code/5183
Author: bphinz
Date: 2014-05-21 10:54:17 +0000 (Wed, 21 May 2014)
Log Message:
-----------
Fixed dependency problems with ubuntu precise build. Added ubuntu trusty
package.
Modified Paths:
--------------
trunk/contrib/packages/deb/ubuntu-precise/debian/control
Added Paths:
-----------
trunk/contrib/packages/deb/ubuntu-trusty/
trunk/contrib/packages/deb/ubuntu-trusty/debian/
trunk/contrib/packages/deb/ubuntu-trusty/debian/changelog
trunk/contrib/packages/deb/ubuntu-trusty/debian/compat
trunk/contrib/packages/deb/ubuntu-trusty/debian/control
trunk/contrib/packages/deb/ubuntu-trusty/debian/copyright
trunk/contrib/packages/deb/ubuntu-trusty/debian/get-orig-source.sh
trunk/contrib/packages/deb/ubuntu-trusty/debian/local/
trunk/contrib/packages/deb/ubuntu-trusty/debian/local/vncserver.service
trunk/contrib/packages/deb/ubuntu-trusty/debian/local/vncserver.sysconfig
trunk/contrib/packages/deb/ubuntu-trusty/debian/patch_fltk.sh
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/100_rethrow_signals.patch
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/504_tigervnc-cookie.patch
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/513_tigervnc11-rh692048.patch
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/516_tigervnc-xorg-manpages.patch
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/518_tigervnc-1.3.0-xserver-1.15.patch
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/series
trunk/contrib/packages/deb/ubuntu-trusty/debian/rules
trunk/contrib/packages/deb/ubuntu-trusty/debian/source/
trunk/contrib/packages/deb/ubuntu-trusty/debian/source/format
trunk/contrib/packages/deb/ubuntu-trusty/debian/tigervncserver.postinst
trunk/contrib/packages/deb/ubuntu-trusty/debian/tigervncserver.prerm
trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.menu
trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.postinst
trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.prerm
Modified: trunk/contrib/packages/deb/ubuntu-precise/debian/control
===================================================================
--- trunk/contrib/packages/deb/ubuntu-precise/debian/control 2014-05-18
01:01:38 UTC (rev 5182)
+++ trunk/contrib/packages/deb/ubuntu-precise/debian/control 2014-05-21
10:54:17 UTC (rev 5183)
@@ -9,7 +9,7 @@
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, libglu1-mesa, libxcursor, libxinerama, libxfixes
+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, libglu1-mesa, libxcursor1, libxinerama1, libxfixes3
Recommends: xfonts-base, x11-xserver-utils
Suggests: xtigervncviewer, tigervnc-java
Description: virtual network computing server software
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/changelog
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/changelog
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/changelog 2014-05-21
10:54:17 UTC (rev 5183)
@@ -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 <bph...@users.sourceforge.net> 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 <bph...@users.sourceforge.net> 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 <bph...@users.sourceforge.net> 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 <bph...@users.sourceforge.net> Sun, 07 Jul 2013 09:55:44
-0400
+
+tigervnc (1.3.0) precise; urgency=low
+
+ * Initial release.
+
+ -- Brian P. Hinz <bph...@users.sourceforge.net> Fri, 05 Jul 2013 00:47:02
-0400
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/compat
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/compat
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/compat 2014-05-21
10:54:17 UTC (rev 5183)
@@ -0,0 +1 @@
+9
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/control
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/control
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/control 2014-05-21
10:54:17 UTC (rev 5183)
@@ -0,0 +1,70 @@
+Source: tigervnc
+Section: x11
+Priority: optional
+Maintainer: Brian P. Hinz <bph...@users.sourceforge.net>
+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), libgnutls28-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-xext-dev, x11proto-xf86bigfont-dev, x11proto-xf86dga-dev,
x11proto-xf86dri-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, libglu1-mesa-dev, libxcursor-dev, libxinerama-dev,
libxfixes-dev
+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, libgnutls28,
libgpg-error0, libjpeg-turbo8, libp11-kit0, libpam0g, libpixman-1-0,
libstdc++6, libtasn1-3-bin, libx11-6, libxau6, libxcb1, libxdmcp6, libxext6,
libxfont1, libxtst6, zlib1g, libglu1-mesa, libxcursor1, libxinerama1, libxfixes3
+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,
libgnutls28, libgpg-error0, libjpeg-turbo8, libp11-kit0, libpng12-0,
libstdc++6, libtasn1-3-bin, libx11-6, libxau6, libxcb1, libxdmcp6, libxext6,
libxft2, libxrender1, zlib1g, libglu1-mesa, libxcursor1, libxinerama1,
libxfixes3
+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.
+
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/copyright
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/copyright
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/copyright 2014-05-21
10:54:17 UTC (rev 5183)
@@ -0,0 +1,116 @@
+This package was packaged for Debian by Brian P. Hinz
<bph...@users.sourceforge.net>
+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
+ jl...@gzip.org mad...@alumni.caltech.edu
+
+ 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.
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/get-orig-source.sh
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/get-orig-source.sh
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/get-orig-source.sh
2014-05-21 10:54:17 UTC (rev 5183)
@@ -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
Property changes on:
trunk/contrib/packages/deb/ubuntu-trusty/debian/get-orig-source.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/local/vncserver.service
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/local/vncserver.service
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/local/vncserver.service
2014-05-21 10:54:17 UTC (rev 5183)
@@ -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
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/local/vncserver.sysconfig
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/local/vncserver.sysconfig
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/local/vncserver.sysconfig
2014-05-21 10:54:17 UTC (rev 5183)
@@ -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"
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/patch_fltk.sh
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/patch_fltk.sh
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/patch_fltk.sh
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,52 @@
+#!/bin/bash
+set -e
+apply_patch()
+{
+ rm -f $2
+ curl -OL http://www.fltk.org/strfiles/$1/$2
+ patch -p1 < $2
+}
+
+# Export dead key information from FLTK to the apps
+# http://www.fltk.org/str.php?L2599
+apply_patch 2599 fltk-1_v4.3.x-keyboard-x11.patch
+apply_patch 2599 fltk-1_v4.3.x-keyboard-win32.patch
+apply_patch 2599 fltk-1_v6.3.x-keyboard-osx.patch
+
+# Notify applications of changes to the clipboard
+# http://www.fltk.org/str.php?L2636
+apply_patch 2636 fltk-1.3.x-clipboard.patch
+apply_patch 2636 fltk-1_v6.3.x-clipboard-x11.patch
+apply_patch 2636 fltk-1_v3.3.x-clipboard-win32-fix.patch
+apply_patch 2636 fltk-1_v2.3.x-clipboard-win32.patch
+apply_patch 2636 fltk-1_v2.3.x-clipboard-osx.patch
+
+# Ability to convert a Fl_Pixmap to a Fl_RGB_Image
+# http://www.fltk.org/str.php?L2659
+apply_patch 2659 pixmap_v2.patch
+
+# Support for custom cursors
+# http://www.fltk.org/str.php?L2660
+apply_patch 2660 fltk-1_v5.3.x-cursor.patch
+
+# Improve modality interaction with WM
+# http://www.fltk.org/str.php?L2802
+apply_patch 2802 fltk-1_v2.3.0-modal.patch
+
+# Window icons
+# http://www.fltk.org/str.php?L2816
+apply_patch 2816 fltk-1_v3.3.0-icons.patch
+
+# Multihead
+# http://fltk.org/str.php?L2860
+apply_patch 2860 fltk-1.3.x-screen_num.patch
+apply_patch 2860 fltk-1_v3.3.x-multihead.patch
+
+# Apply DRC's patches to FLTK
+curl -L
'https://sourceforge.net/mailarchive/attachment.php?list_name=tigervnc-devel&message_id=512DD1FE.7090609%40users.sourceforge.net&counter=1'
-o 0001-Add-BUILD_STATIC-feature-from-TigerVNC-to-optionally.patch
+curl -L
'https://sourceforge.net/mailarchive/attachment.php?list_name=tigervnc-devel&message_id=512DD1FE.7090609%40users.sourceforge.net&counter=2'
-o 0002-Fl_cocoa.mm-depends-on-some-Carbon-functions-so-we-n.patch
+curl -L
'https://sourceforge.net/mailarchive/attachment.php?list_name=tigervnc-devel&message_id=512DD1FE.7090609%40users.sourceforge.net&counter=3'
-o 0003-We-need-to-unset-CMAKE_REQUIRED_LIBRARIES-after-chec.patch
+
+patch -p1 -i 0001-Add-BUILD_STATIC-feature-from-TigerVNC-to-optionally.patch
+patch -p1 -i 0002-Fl_cocoa.mm-depends-on-some-Carbon-functions-so-we-n.patch
+patch -p1 -i 0003-We-need-to-unset-CMAKE_REQUIRED_LIBRARIES-after-chec.patch
Property changes on:
trunk/contrib/packages/deb/ubuntu-trusty/debian/patch_fltk.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added:
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/100_rethrow_signals.patch
===================================================================
---
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/100_rethrow_signals.patch
(rev 0)
+++
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/100_rethrow_signals.patch
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,26 @@
+--- a/unix/xserver/hw/vnc/xvnc.cc 2013-07-14 14:05:29.963390223 -0400
++++ b/unix/xserver/hw/vnc/xvnc.cc 2013-07-14 14:04:12.840357191 -0400
+@@ -250,7 +250,7 @@
+ #if XORG < 111
+ AbortDDX()
+ #else
+-AbortDDX(enum ExitCode error)
++SigAbortDDX(int signo, enum ExitCode error)
+ #endif
+ {
+ #if XORG < 111
+@@ -260,6 +260,14 @@
+ #endif
+ }
+
++#if XORG >= 111
++void
++AbortDDX(enum ExitCode error)
++{
++ SigAbortDDX(0, error);
++}
++#endif
++
+ #ifdef __DARWIN__
+ void
+ DarwinHandleGUI(int argc, char *argv[])
Added:
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/504_tigervnc-cookie.patch
===================================================================
---
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/504_tigervnc-cookie.patch
(rev 0)
+++
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/504_tigervnc-cookie.patch
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,36 @@
+--- a/unix/vncserver 2009-11-12 11:39:54.000000000 +0100
++++ b/unix/vncserver 2009-12-21 16:15:01.907799091 +0100
+@@ -189,27 +189,12 @@ $vncPort = 5900 + $displayNumber;
+ $desktopLog = "$vncUserDir/$host:$displayNumber.log";
+ unlink($desktopLog);
+
+-# Make an X server cookie - use /dev/urandom on systems that have it,
+-# otherwise use perl's random number generator, seeded with the sum
+-# of the current time, our PID and part of the encrypted form of the password.
+-
+-my $cookie = "";
+-if (open(URANDOM, '<', '/dev/urandom')) {
+- my $randata;
+- if (sysread(URANDOM, $randata, 16) == 16) {
+- $cookie = unpack 'h*', $randata;
+- }
+- close(URANDOM);
+-}
+-if ($cookie eq "") {
+- srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
+- for (1..16) {
+- $cookie .= sprintf("%02x", int(rand(256)) % 256);
+- }
+-}
+-
+-system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
+-system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie");
++# Make an X server cookie - use mcookie
++$cookie = `/usr/bin/mcookie`;
++open (XAUTH, "|xauth -f $xauthorityFile source -");
++print XAUTH "add $host:$displayNumber . $cookie\n";
++print XAUTH "add $host/unix:$displayNumber . $cookie\n";
++close XAUTH;
+
+ if ($opt{'-name'}) {
+ $desktopName = $opt{'-name'};
Added:
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch
===================================================================
---
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch
(rev 0)
+++
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,11 @@
+--- a/unix/xserver/hw/vnc/Makefile.am 2011-10-31 09:14:40.000000000 +0100
++++ b/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:51:47.013241342 +0200
+@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
+ -I$(top_srcdir)/include \
+ ${XSERVERLIBS_CFLAGS} -I$(includedir)
+
+-libvnc_la_LDFLAGS = -module -avoid-version
++libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
+
+ libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
+
Added:
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch
===================================================================
---
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch
(rev 0)
+++
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,19 @@
+--- a/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:01.876216608 +0200
++++ b/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:45.973143684 +0200
+@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la
+ RDR_LIB=$(LIB_DIR)/rdr/librdr.la
+ NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
+ XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
++OS_LIB=$(LIB_DIR)/os/libos.la
+ COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
+
+ noinst_LTLIBRARIES = libvnccommon.la
+@@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
+
+ libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
+
+-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
++libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
+
+ EXTRA_DIST = Xvnc.man
+
Added:
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/513_tigervnc11-rh692048.patch
===================================================================
---
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/513_tigervnc11-rh692048.patch
(rev 0)
+++
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/513_tigervnc11-rh692048.patch
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,43 @@
+--- a/common/rfb/SecurityClient.cxx 2011-02-21 14:14:16.000000000 +0100
++++ b/common/rfb/SecurityClient.cxx 2011-03-31 09:47:34.519099718 +0200
+@@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes
+ ("SecurityTypes",
+ "Specify which security scheme to use (None, VncAuth)",
+ #ifdef HAVE_GNUTLS
+- "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
++ "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
+ #else
+ "VncAuth,None",
+ #endif
+diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245
tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx
+--- tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245
2011-02-21 14:14:16.000000000 +0100
++++ tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx 2011-03-31
09:47:34.519099718 +0200
+@@ -67,7 +67,6 @@ const std::list<rdr::U8> Security::GetEn
+ list<rdr::U8> result;
+ list<U32>::iterator i;
+
+- result.push_back(secTypeVeNCrypt);
+ for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
+ if (*i < 0x100)
+ result.push_back(*i);
+@@ -105,8 +104,6 @@ bool Security::IsSupported(U32 secType)
+ for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
+ if (*i == secType)
+ return true;
+- if (secType == secTypeVeNCrypt)
+- return true;
+
+ return false;
+ }
+diff -up
tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245
tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx
+--- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245
2011-02-21 14:50:17.000000000 +0100
++++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx
2011-03-31 10:06:43.595362302 +0200
+@@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes
+ ("SecurityTypes",
+ "Specify which security scheme to use (None, VncAuth)",
+ #ifdef HAVE_GNUTLS
+- "VncAuth,TLSVnc",
++ "VncAuth",
+ #else
+ "VncAuth",
+ #endif
Added:
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/516_tigervnc-xorg-manpages.patch
===================================================================
---
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/516_tigervnc-xorg-manpages.patch
(rev 0)
+++
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/516_tigervnc-xorg-manpages.patch
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,10 @@
+--- a/unix/xserver/man/Makefile.am 2013-03-30 17:51:01.707258746 -0400
++++ b/unix/xserver/man/Makefile.am 2013-03-30 17:51:47.606569692 -0400
+@@ -2,5 +2,7 @@
+ # (i.e. those handled in the os/utils.c options processing instead of in
+ # the DDX-level options processing)
+
++if ENABLE_DOCS
+ include $(top_srcdir)/manpages.am
+ appman_PRE = Xserver.man
++endif ENABLE_DOCS
Added:
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch
===================================================================
---
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch
(rev 0)
+++
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,12 @@
+diff -up tigervnc-1.3.0/vncviewer/vncviewer.cxx.format-security
tigervnc-1.3.0/vncviewer/vncviewer.cxx
+--- tigervnc-1.3.0/vncviewer/vncviewer.cxx.format-security 2013-12-03
16:47:04.802800182 +0000
++++ tigervnc-1.3.0/vncviewer/vncviewer.cxx 2013-12-03 16:47:08.680820024
+0000
+@@ -309,7 +309,7 @@ interpretViaParam(char *remoteHost, int
+
+ snprintf(vncServerName, VNCSERVERNAMELEN, "localhost::%d", localPort);
+ vncServerName[VNCSERVERNAMELEN - 1] = '\0';
+- vlog.error(vncServerName);
++ vlog.error("%s", vncServerName);
+
+ return 0;
+ }
Added:
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/518_tigervnc-1.3.0-xserver-1.15.patch
===================================================================
---
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/518_tigervnc-1.3.0-xserver-1.15.patch
(rev 0)
+++
trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/518_tigervnc-1.3.0-xserver-1.15.patch
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,29 @@
+diff -up a/unix/xserver/configure.ac.jx b/unix/xserver/configure.ac
+--- a/unix/xserver/configure.ac.jx 2013-11-07 11:39:49.000000000 -0500
++++ b/unix/xserver/configure.ac 2013-11-07 11:40:17.215043570 -0500
+@@ -1597,7 +1596,7 @@ fi
+
+ dnl Xvnc DDX
+ AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
+-AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB
$RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB
$MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB
$COMPOSITE_LIB $MAIN_LIB"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB
$RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB
$MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB
$XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
+ AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
+
+ dnl Xnest DDX
+diff -up a/unix/xserver/hw/vnc/xorg-version.h
b/unix/xserver/hw/vnc/xorg-version.h
+--- a/unix/xserver/hw/vnc/xorg-version.h 2013-07-01 08:41:24.000000000
-0400
++++ b/unix/xserver/hw/vnc/xorg-version.h 2013-11-07 11:39:49.749992669
-0500
+@@ -44,8 +44,12 @@
+ #define XORG 113
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
+ #define XORG 114
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000))
++#define XORG 115
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000))
++#define XORG 116
+ #else
+-#error "X.Org newer than 1.14 is not supported"
++#error "X.Org newer than 1.16 is not supported"
+ #endif
+
+ #endif
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/series
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/series
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/patches/series
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,14 @@
+## Patches with a number < 100 are applied in debian.
+## Ubuntu patches start with 100.
+
+# Ubuntu patches
+100_rethrow_signals.patch
+
+# Upstream patches
+504_tigervnc-cookie.patch
+510_tigervnc11-ldnow.patch
+511_tigervnc11-gethomedir.patch
+513_tigervnc11-rh692048.patch
+516_tigervnc-xorg-manpages.patch
+517_tigervnc-format-security.patch
+518_tigervnc-1.3.0-xserver-1.15.patch
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/rules
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/rules
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/rules 2014-05-21
10:54:17 UTC (rev 5183)
@@ -0,0 +1,294 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 by Joey Hess.
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+
+export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+#DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+#DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+SOURCE_NAME := tigervnc
+SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: /
{print $$2}')
+BUILDER=For technical support please see
http://sourceforge.net/projects/tigervnc/support
+libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
+
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g -O2 -fPIC
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+export CC = gcc
+
+XCFLAGS = -Wall -Wunused -Wno-format-y2k -fPIE -fno-strict-aliasing
+
+get-orig-source: $(SOURCE_NAME)_$(SOURCE_VERSION).orig.tar.gz
+ @
+
+$(SOURCE_NAME)_$(SOURCE_VERSION).orig.tar.gz:
+ $(CURDIR)/get-orig-source.sh
+
+configure: config-stamp
+config-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+ (cd fltk-*;DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \
+ ./configure --enable-shared=no --enable-cairo --enable-cp936 \
+ --with-optim="$(CFLAGS) $(XCFLAGS)" --libdir=$(libdir);make)
+ cmake -G"Unix Makefiles" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+
-DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng"
\
+ -DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2
+ (cd unix/xserver; \
+ export PIXMANINCDIR=/usr/include/pixman-1; \
+ autoreconf -fiv; \
+ ./configure --prefix=/usr \
+ --disable-silent-rules \
+ --disable-static \
+ --without-dtrace \
+ --disable-strict-compilation \
+ --disable-debug \
+ --disable-unit-tests \
+ --with-int10=x86emu \
+
--with-extra-module-dir="/usr/lib/${DEB_HOST_MULTIARCH}/xorg/extra-modules,/usr/lib/xorg/extra-modules"
\
+ --with-os-vendor="$(VENDOR)" \
+ --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION)
($(BUILDER))" \
+ --with-xkb-path=/usr/share/X11/xkb \
+ --with-xkb-output=/var/lib/xkb \
+ --with-default-xkb-rules=evdev \
+ --disable-devel-docs \
+ --disable-install-libxf86config \
+ --enable-mitshm \
+ --enable-xres \
+ --disable-xcsecurity \
+ --disable-xcalibrate \
+ --disable-tslib \
+ --enable-dbe \
+ --disable-xf86bigfont \
+ --disable-dpms \
+ --disable-config-dbus \
+ --disable-config-hal \
+ --disable-config-udev \
+ --disable-xorg \
+ --disable-xquartz \
+ --disable-xwin \
+ --disable-xfake \
+ --disable-install-setuid \
+ --enable-gestures \
+
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType,built-ins"
\
+ --enable-aiglx \
+ --enable-glx-tls \
+ --enable-registry \
+ --enable-composite \
+ --enable-record \
+ --enable-xv \
+ --enable-xvmc \
+ --enable-dga \
+ --enable-screensaver \
+ --enable-xdmcp \
+ --enable-xdm-auth-1 \
+ --enable-glx \
+ --disable-dri --enable-dri2 --enable-dri3 \
+ --disable-xinerama \
+ --enable-xf86vidmode \
+ --enable-xace \
+ --disable-selinux \
+ --enable-xfree86-utils \
+ --disable-dmx \
+ --disable-xvfb \
+ --disable-xnest \
+ --disable-kdrive \
+ --disable-xephyr \
+ --enable-xfbdev \
+ --with-sha1=libgcrypt \
+ --enable-xcsecurity \
+ --disable-docs \
+ --disable-selective-werror)
+ touch config-stamp
+
+build-arch: config-stamp build-arch-stamp
+build-arch-stamp:
+ dh_testdir
+
+ # Add here command to compile/build the package.
+ # Build first things.
+ # Build Xvnc
+ make LDFLAGS="-lpng"
+ (cd unix/xserver;make)
+
+ touch build-arch-stamp
+
+build-indep: config-stamp build-indep-stamp
+build-indep-stamp:
+ dh_testdir
+
+ # Add here command to compile/build the arch indep package.
+ # It's ok not to do anything here, if you don't need to build
+ # anything for this package.
+ #/usr/bin/docbook-to-man debian/vnc.sgml > vnc.1
+ (cd media;make)
+ (cd java;cmake -G"Unix Makefiles";make)
+
+ touch build-indep-stamp
+
+build: build-arch build-indep
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-arch-stamp build-indep-stamp config-stamp
+
+ # Add here commands to clean up after the build process.
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_prep
+ dh_installdirs
+ # Add here commands to install the package into debian/vnc.
+ # tigervncserver
+ make install DESTDIR=$(CURDIR)/debian/tigervncserver
+ (cd unix/xserver/hw/vnc; make install
DESTDIR=$(CURDIR)/debian/tigervncserver)
+ mv $(CURDIR)/debian/tigervncserver/usr/bin/Xvnc \
+ $(CURDIR)/debian/tigervncserver/usr/bin/Xtigervnc
+ mv $(CURDIR)/debian/tigervncserver/usr/bin/vncconfig \
+ $(CURDIR)/debian/tigervncserver/usr/bin/tigervncconfig
+ mv $(CURDIR)/debian/tigervncserver/usr/bin/vncpasswd \
+ $(CURDIR)/debian/tigervncserver/usr/bin/tigervncpasswd
+ mv $(CURDIR)/debian/tigervncserver/usr/bin/vncserver \
+ $(CURDIR)/debian/tigervncserver/usr/bin/tigervncserver
+ mv $(CURDIR)/debian/tigervncserver/usr/bin/x0vncserver \
+ $(CURDIR)/debian/tigervncserver/usr/bin/x0tigervncserver
+ mv $(CURDIR)/debian/tigervncserver/usr/share/man/man1/vncconfig.1 \
+
$(CURDIR)/debian/tigervncserver/usr/share/man/man1/tigervncconfig.1
+ mv $(CURDIR)/debian/tigervncserver/usr/share/man/man1/vncpasswd.1 \
+
$(CURDIR)/debian/tigervncserver/usr/share/man/man1/tigervncpasswd.1
+ mv $(CURDIR)/debian/tigervncserver/usr/share/man/man1/vncserver.1 \
+
$(CURDIR)/debian/tigervncserver/usr/share/man/man1/tigervncserver.1
+ mv $(CURDIR)/debian/tigervncserver/usr/share/man/man1/x0vncserver.1 \
+
$(CURDIR)/debian/tigervncserver/usr/share/man/man1/x0tigervncserver.1
+ mv $(CURDIR)/debian/tigervncserver/usr/share/man/man1/Xvnc.1 \
+ $(CURDIR)/debian/tigervncserver/usr/share/man/man1/Xtigervnc.1
+ mv $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-* \
+ $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervncserver
+ rm
$(CURDIR)/debian/tigervncserver/usr/lib/xorg/modules/extensions/libvnc.la
+ rm $(CURDIR)/debian/tigervncserver/usr/bin/vncviewer
+ rm $(CURDIR)/debian/tigervncserver/usr/share/man/man1/vncviewer.1
+ install -o root -g root -m 755 -D
$(CURDIR)/debian/local/vncserver.service \
+ $(CURDIR)/debian/tigervncserver/etc/init.d/vncserver
+ install -o root -g root -m 644 -D
$(CURDIR)/debian/local/vncserver.sysconfig \
+ $(CURDIR)/debian/tigervncserver/etc/default/vncservers
+ # xtigervncviewer
+ (cd vncviewer; make install DESTDIR=$(CURDIR)/debian/xtigervncviewer)
+ # Install desktop stuff
+ mv $(CURDIR)/debian/xtigervncviewer/usr/bin/vncviewer \
+ $(CURDIR)/debian/xtigervncviewer/usr/bin/xtigervncviewer
+ mv $(CURDIR)/debian/xtigervncviewer/usr/share/man/man1/vncviewer.1 \
+
$(CURDIR)/debian/xtigervncviewer/usr/share/man/man1/xtigervncviewer.1
+ install -o root -g root -m 644 -D media/icons/tigervnc_16.png \
+
$(CURDIR)/debian/xtigervncviewer/usr/share/icons/hicolor/16x16/apps/tigervnc.png
+ install -o root -g root -m 644 -D media/icons/tigervnc_22.png \
+
$(CURDIR)/debian/xtigervncviewer/usr/share/icons/hicolor/22x22/apps/tigervnc.png
+ install -o root -g root -m 644 -D media/icons/tigervnc_24.png \
+
$(CURDIR)/debian/xtigervncviewer/usr/share/icons/hicolor/24x24/apps/tigervnc.png
+ install -o root -g root -m 644 -D media/icons/tigervnc_32.png \
+
$(CURDIR)/debian/xtigervncviewer/usr/share/icons/hicolor/32x32/apps/tigervnc.png
+ install -o root -g root -m 644 -D media/icons/tigervnc_48.png \
+
$(CURDIR)/debian/xtigervncviewer/usr/share/icons/hicolor/48x48/apps/tigervnc.png
+ install -o root -g root -m 644 -D media/icons/tigervnc.svg \
+
$(CURDIR)/debian/xtigervncviewer/usr/share/icons/hicolor/scalable/apps/tigervnc.svg
+ # tigervnc-java
+ mkdir -p $(CURDIR)/debian/tigervnc-java/usr/share
+ (cd java; make install DESTDIR=$(CURDIR)/debian/tigervnc-java/usr/share)
+ #dh_movefiles
+
+# Build architecture-independent files here.
+# Pass -i to all debhelper commands in this target to reduce clutter.
+binary-indep: build install
+
+binary-indep-keep:
+ dh_testdir -i
+ dh_testroot -i
+# dh_installdebconf -i
+ dh_install
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_installmenu -i
+# dh_installlogrotate -i
+# dh_installemacsen -i
+# dh_installpam -i
+# dh_installmime -i
+# dh_installinit -i
+ dh_installcron -i
+ dh_installman -i
+ dh_installinfo -i
+# dh_undocumented -i
+ dh_installchangelogs -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_perl -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+# dh_installdebconf -a
+ dh_installdocs -a
+# dh_installexamples -a
+ dh_installmenu -a
+# dh_installlogrotate -a
+# dh_installemacsen -a
+# dh_installpam -a
+# dh_installmime -a
+ dh_install
+ dh_installinit -a
+# dh_installcron -a
+ dh_installman -a
+ dh_installinfo -a
+# dh_undocumented -a
+ dh_installchangelogs -a
+ # Remove empty directories
+ dh_strip -a
+ dh_link -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -a
+ dh_installdeb -a
+ dh_perl -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install get-orig-source
Property changes on: trunk/contrib/packages/deb/ubuntu-trusty/debian/rules
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/source/format
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/source/format
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/source/format
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/tigervncserver.postinst
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/tigervncserver.postinst
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/tigervncserver.postinst
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+ MAN=/usr/share/man/man1
+ BIN=/usr/bin
+ update-alternatives --install \
+ $BIN/vncserver vncserver $BIN/tigervncserver 64 \
+ --slave \
+ $MAN/vncserver.1.gz vncserver.1.gz $MAN/tigervncserver.1.gz
+ update-alternatives --install \
+ $BIN/Xvnc Xvnc $BIN/Xtigervnc 74 \
+ --slave \
+ $MAN/Xvnc.1.gz Xvnc.1.gz $MAN/Xtigervnc.1.gz
+ update-alternatives --install \
+ $BIN/x0vncserver x0vncserver $BIN/x0tigervncserver 74 \
+ --slave \
+ $MAN/x0vncserver.1.gz x0vncserver.1.gz $MAN/x0tigervncserver.1.gz
+ update-alternatives --install \
+ $BIN/vncpasswd vncpasswd $BIN/tigervncpasswd 74 \
+ --slave \
+ $MAN/vncpasswd.1.gz vncpasswd.1.gz $MAN/tigervncpasswd.1.gz
+ update-alternatives --install \
+ $BIN/vncconfig vncconfig $BIN/tigervncconfig 64 \
+ --slave \
+ $MAN/vncconfig.1.gz vncconfig.1.gz $MAN/tigervncconfig.1.gz
+fi
+
+#DEBHELPER#
+
+exit 0
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/tigervncserver.prerm
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/tigervncserver.prerm
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/tigervncserver.prerm
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] ; then
+ BIN=/usr/bin
+ update-alternatives --remove \
+ vncserver $BIN/tigervncserver
+ update-alternatives --remove \
+ Xvnc $BIN/Xtigervnc
+ update-alternatives --remove \
+ x0vncserver $BIN/x0tigervncserver
+ update-alternatives --remove \
+ vncpasswd $BIN/tigervncpasswd
+ update-alternatives --remove \
+ tigervncconfig $BIN/tigervncconfig
+fi
+
+#DEBHELPER#
+
+exit 0
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.menu
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.menu
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.menu
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,5 @@
+?package(xtigervncviewer):needs="x11" \
+ section="Applications/Network/Communication" \
+ hints="VNC,remote-control"\
+ title="xtigervncviewer" \
+ command="/usr/bin/xtigervncviewer"
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.postinst
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.postinst
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.postinst
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+ MAN=/usr/share/man/man1
+ BIN=/usr/bin
+ update-alternatives --install \
+ $BIN/vncviewer vncviewer $BIN/xtigervncviewer 74 \
+ --slave \
+ $MAN/vncviewer.1.gz vncviewer.1.gz $MAN/xtigervncviewer.1.gz \
+ --slave \
+ $MAN/xvncviewer.1.gz xvncviewer.1.gz $MAN/xtigervncviewer.1.gz \
+ --slave \
+ $BIN/xvncviewer xvncviewer $BIN/xtigervncviewer
+fi
+
+#DEBHELPER#
+
+exit 0
Added: trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.prerm
===================================================================
--- trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.prerm
(rev 0)
+++ trunk/contrib/packages/deb/ubuntu-trusty/debian/xtigervncviewer.prerm
2014-05-21 10:54:17 UTC (rev 5183)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ] ; then
+ BIN=/usr/bin
+ update-alternatives --remove \
+ vncviewer $BIN/xtigervncviewer
+fi
+
+#DEBHELPER#
+
+exit 0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
