summaryrefslogtreecommitdiffstats
path: root/contrib/packages/deb/ubuntu-trusty
diff options
context:
space:
mode:
authorBrian P. Hinz <bphinz@users.sf.net>2016-01-08 23:04:51 -0500
committerBrian P. Hinz <bphinz@users.sf.net>2016-01-09 00:02:32 -0500
commita6a52a414902fbebede9c98c446753eedda91987 (patch)
tree4f6638f54fafe05c2424739f5855f42401fdb6a3 /contrib/packages/deb/ubuntu-trusty
parent0260a9f9c42024d04fe7c4ea1941d71618683353 (diff)
downloadtigervnc-a6a52a414902fbebede9c98c446753eedda91987.tar.gz
tigervnc-a6a52a414902fbebede9c98c446753eedda91987.zip
Ubuntu package fixes
Adds missing build dependencies and fixes java compile issues caused by non-ascii characters in comments.
Diffstat (limited to 'contrib/packages/deb/ubuntu-trusty')
-rw-r--r--contrib/packages/deb/ubuntu-trusty/debian/control2
-rwxr-xr-xcontrib/packages/deb/ubuntu-trusty/debian/rules2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/control b/contrib/packages/deb/ubuntu-trusty/debian/control
index fc128f0d..ec671034 100644
--- a/contrib/packages/deb/ubuntu-trusty/debian/control
+++ b/contrib/packages/deb/ubuntu-trusty/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.tigervnc.com
Package: tigervncserver
Architecture: any
Provides: xserver, vnc-server
-Depends: x11-common | xserver-common, x11-utils, xauth, libbz2-1.0, libc6, libfontenc1, libfreetype6, libgcc1, libgl1-mesa-dri, libgnutls28, 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
+Depends: x11-common | xserver-common, x11-utils, xauth, libbz2-1.0, libc6, libfontenc1, libfreetype6, libgcc1, libgl1-mesa-dri, libgnutls28, 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, x11-xkb-utils
Recommends: xfonts-base, x11-xserver-utils
Suggests: xtigervncviewer, tigervnc-java
Description: virtual network computing server software
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules
index 09d28966..b3e8187f 100755
--- a/contrib/packages/deb/ubuntu-trusty/debian/rules
+++ b/contrib/packages/deb/ubuntu-trusty/debian/rules
@@ -150,7 +150,7 @@ build-indep-stamp:
# anything for this package.
#/usr/bin/docbook-to-man debian/vnc.sgml > vnc.1
(cd media;make)
- (cd java;cmake -G"Unix Makefiles";make)
+ (cd java;cmake -G"Unix Makefiles";JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make)
touch build-indep-stamp