Subversion Repositories ssvnc

Compare Revisions

Ignore whitespace Rev 17 → Rev 24

/ssvnc/tags/1.0.28-1/debian/patches/series
0,0 → 1,2
confusing_-h.patch
ultraftp_path.patch
/ssvnc/tags/1.0.28-1/debian/patches/ultraftp_path.patch
0,0 → 1,45
Author: Magnus Holmgren <holmgren@debian.org>
Description: Use hardcoded (and correct for the Debian package) path to ultraftp.jar
if SSVNC_ULTRA_FTP_JAR is unset.
 
diff -urNad trunk~/vnc_unixsrc/vncviewer/argsresources.c trunk/vnc_unixsrc/vncviewer/argsresources.c
--- trunk~/vnc_unixsrc/vncviewer/argsresources.c 2009-10-27 04:26:12.000000000 +0100
+++ trunk/vnc_unixsrc/vncviewer/argsresources.c 2009-10-31 15:22:46.000000000 +0100
@@ -1624,35 +1624,8 @@
appData.useBGR233 = 0;
}
- if (getenv("SSVNC_ULTRA_FTP_JAR") == NULL && programName != NULL) {
- int len = strlen(programName) + 200;
- char *q, *jar = (char *) malloc(len);
-
- sprintf(jar, "%s", programName);
- q = strrchr(jar, '/');
- if (q) {
- struct stat sb;
- *(q+1) = '\0';
- strcat(jar, "../lib/ssvnc/util/ultraftp.jar");
- if (stat(jar, &sb) == 0) {
- char *put = (char *) malloc(len);
- sprintf(put, "SSVNC_ULTRA_FTP_JAR=%s", jar);
- fprintf(stderr, "Setting: %s\n\n", put);
- putenv(put);
- } else {
- sprintf(jar, "%s", programName);
- q = strrchr(jar, '/');
- *(q+1) = '\0';
- strcat(jar, "util/ultraftp.jar");
- if (stat(jar, &sb) == 0) {
- char *put = (char *) malloc(len);
- sprintf(put, "SSVNC_ULTRA_FTP_JAR=%s", jar);
- fprintf(stderr, "Setting: %s\n\n", put);
- putenv(put);
- }
- }
- }
- free(jar);
+ if (getenv("SSVNC_ULTRA_FTP_JAR") == NULL) {
+ putenv("SSVNC_ULTRA_FTP_JAR=/usr/lib/ssvnc/util/ultraftp.jar");
}
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: 1.0.28-1/debian/patches/confusing_-h.patch
===================================================================
--- 1.0.28-1/debian/patches/confusing_-h.patch (nonexistent)
+++ 1.0.28-1/debian/patches/confusing_-h.patch (revision 24)
@@ -0,0 +1,37 @@
+Description: Improve handling of -h[e[l[p]]]
+ Catches -he and -hel as well, instead of letting wish print its usage
+ message (that sounds like an error message).
+Author: Magnus Holmgren <holmgren@debian.org>
+Bug-Debian: http://bugs.debian.org/544250
+
+diff -urNad trunk~/scripts/ssvnc trunk/scripts/ssvnc
+--- trunk~/scripts/ssvnc 2009-12-27 21:38:58.000000000 +0100
++++ trunk/scripts/ssvnc 2010-02-06 20:38:41.000000000 +0100
+@@ -8,7 +8,8 @@
+ #
+ # See ssvnc_cmd for details.
+ #
+-if [ "X$1" = "X-help" -o "X$1" = "X-h" ]; then
++helpflag="-help"
++if [ ${#1} -gt 1 -a "$1${helpflag##$1}" = $helpflag ]; then
+ cat << END
+ ssvnc - a GUI wrapper for SSL and SSH VNC connections.
+
+@@ -106,7 +107,7 @@
+ exit 0
+ fi
+ if [ "X$1" = "X-ssh" ]; then
+- if [ "X$2" = "X-help" -o "X$2" = "X-h" ]; then
++ if [ ${#2} -gt 1 -a "$2${helpflag##$2}" = $helpflag ]; then
+ cat << END
+ sshvnc - a GUI wrapper for SSH VNC connections.
+
+@@ -124,7 +125,7 @@
+ fi
+
+ if [ "X$1" = "X-ts" -o "X$1" = "X-tso" ]; then
+- if [ "X$2" = "X-help" -o "X$2" = "X-h" ]; then
++ if [ ${#2} -gt 1 -a "$2${helpflag##$2}" = $helpflag ]; then
+ cat << END
+ tsvnc - a GUI wrapper for SSH VNC connections using x11vnc Terminal Services.
+
/1.0.28-1/debian/patches/confusing_-h.patch
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: 1.0.28-1/debian/control
===================================================================
--- 1.0.28-1/debian/control (nonexistent)
+++ 1.0.28-1/debian/control (revision 24)
@@ -0,0 +1,33 @@
+Source: ssvnc
+Section: net
+Priority: extra
+Maintainer: Magnus Holmgren <holmgren@debian.org>
+Build-Depends: debhelper (>= 7), xutils-dev, libxaw7-dev,
+ libxmu-dev, libxext-dev, libxt-dev, libsm-dev, libice-dev,
+ libjpeg62-dev | libjpeg-dev, zlib1g-dev | libz-dev,
+ default-jdk, libssl-dev
+Standards-Version: 3.9.1
+Homepage: http://www.karlrunge.com/x11vnc/ssvnc.html
+
+Package: ssvnc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, tk,
+ openssh-client, bind9-host | host, procps, psmisc, xterm,
+ stunnel4, openssl
+Recommends: default-jre | java5-runtime
+Description: Enhanced TightVNC viewer with SSL/SSH tunnel helper
+ VNC stands for Virtual Network Computing. It is, in essence, a remote
+ display system which allows you to view a computing `desktop'
+ environment not only on the machine where it is running, but from
+ anywhere on the Internet and from a wide variety of machine
+ architectures.
+ .
+ SSVNC is two things:
+ .
+ * An enhanced version of the TightVNC client with support for more
+ encodings and color modes, support for x11vnc and UltraVNC
+ extensions, dynamic screen resizing, an improved popup menu, etc.
+ .
+ * A GUI that helps set up an SSL (using stunnel) or SSH tunnel to
+ connect to the VNC server through, as well as forwarding of ports for
+ audio (esound/aRts), SMB, CUPS etc.
Index: 1.0.28-1/debian/changelog
===================================================================
--- 1.0.28-1/debian/changelog (nonexistent)
+++ 1.0.28-1/debian/changelog (revision 24)
@@ -0,0 +1,56 @@
+ssvnc (1.0.28-1) unstable; urgency=low
+
+ * New upstream release (Closes: #592873, "Connection from UVNC
+ Single-Click does not start vncviewer when -acceptpopups is set").
+ * Convert to source format 3.0 (quilt), changing /bin/sh into /bin/bash
+ (see below) in the install target instead.
+ * debian/copyright: Update years of copyright; remove notice that the
+ UltraVNC DSM helper module is not included (which it is since
+ 1.0.24-1).
+ * Remove redundant bash dependency; bash isn't going to be non-essential
+ any time soon.
+ * Up Standards-Version to 3.9.1.
+
+ -- Magnus Holmgren <holmgren@debian.org> Sun, 06 Feb 2011 23:06:25 +0100
+
+ssvnc (1.0.27-1) unstable; urgency=low
+
+ * New upstream release.
+ * bashisms.dpatch: Don't try to fix all bashisms; instead change /bin/sh
+ to /bin/bash and depend on bash, which is small in this context.
+
+ -- Magnus Holmgren <holmgren@debian.org> Sun, 23 May 2010 19:07:52 +0200
+
+ssvnc (1.0.25-1) unstable; urgency=low
+
+ * New upstream release.
+ * confusing_-h.dpatch and bashisms.dpatch: adjusted.
+
+ -- Magnus Holmgren <holmgren@debian.org> Sat, 06 Feb 2010 20:45:04 +0100
+
+ssvnc (1.0.24-1) unstable; urgency=low
+
+ * New upstream release.
+ * ssvnc -help now prints a help message instead of passing -help to the
+ tcl interpreter.
+ * confusing_-h.dpatch (new): Improve upstream's handling of -help a bit
+ (Closes: 544250).
+ * ultraftp_path.dpach (new): Use hardcoded (and correct for this
+ package) path to ultraftp.jar if SSVNC_ULTRA_FTP_JAR is unset, so that
+ file transfers work even if ssvncviewer is executed directly.
+ * bashisms.dpatch (new): Fix most bashisms (all that matter).
+ * Drop no_openssl.dpatch and build ultravnc_dsm_helper; OpenSSL
+ exception has been granted. Build-depend on libssl-dev.
+ * Promote stunnel4 from Recommends to Depends (Closes: #553411), depend
+ directly on openssl, depend on tk instead of tk8.4, and tweak java
+ recommendations.
+ * Add README.source.
+ * Bump Standards-Version to 3.8.3.
+
+ -- Magnus Holmgren <holmgren@debian.org> Sat, 31 Oct 2009 21:02:42 +0100
+
+ssvnc (1.0.23-1) unstable; urgency=low
+
+ * Initial release (Closes: #504134).
+
+ -- Magnus Holmgren <holmgren@debian.org> Sat, 01 Aug 2009 19:31:25 +0200
Index: 1.0.28-1/debian/copyright
===================================================================
--- 1.0.28-1/debian/copyright (nonexistent)
+++ 1.0.28-1/debian/copyright (revision 24)
@@ -0,0 +1,109 @@
+This package was debianized by Magnus Holmgren <holmgren@debian.org> on
+Fri, 31 Oct 2008 22:08:16 +0100.
+
+It was downloaded from <http://www.karlrunge.com/x11vnc/ssvnc.html>
+
+Upstream Author:
+
+ Karl J. Runge <runge@karlrunge.com>
+
+Copyright:
+
+ Copyright © 2006-2010 Karl J. Runge
+ TightVNC Copyright © 2001-2003 Constantin Kaplinsky
+ VNC Copyright © AT&T Laboratories Cambridge,
+ © 1994-2000 Olivetti Research Ltd/AT&T Laboratories Cambridge.
+
+License:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of version 2 of the GNU General Public
+ License as published by the Free Software Foundation.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA
+
+Special GPL exception for ultravnc_dsm_helper:
+
+ In addition, as a special exception, Karl J. Runge gives permission
+ to link the code of its release of ultravnc_dsm_helper with the
+ OpenSSL project's "OpenSSL" library (or with modified versions of it
+ that use the same license as the "OpenSSL" library), and distribute
+ the linked executables. You must obey the GNU General Public License
+ in all respects for all of the code used other than "OpenSSL". If you
+ modify this file, you may extend this exception to your version of the
+ file, but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version.
+
+
+ZYWRLE VNC codec © 2006 Hitachi Systems & Services, Ltd. (Noriaki
+Yamazaki, Research & Development Center)
+
+License:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ - Neither the name of the Hitachi Systems & Services, Ltd. nor the
+ names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+
+SSVNC includes the Ultr@VNC 1.0.0 RC19 Java Viewer.
+
+Copyright:
+
+ © 2002-2005 Ultr@VNC Team. All Rights Reserved.
+ © 2004 Kenn Min Chong, John Witchel. All Rights Reserved.
+ © 2004 Alban Chazot. All Rights Reserved.
+ © 2001,2002 HorizonLive.com, Inc. All Rights Reserved.
+ © 2001,2002 Constantin Kaplinsky. All Rights Reserved.
+ © 1999 AT&T Laboratories Cambridge. All Rights Reserved.
+
+License:
+
+ 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. VNC also contains
+ code from other sources. See the Acknowledgements section below, and the
+ individual files for details of the conditions under which they are made
+ available.
+
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2' instead.
+
+
+The Debian packaging is © 2008-2011, Magnus Holmgren
+<holmgren@debian.org> and is licensed under the GPL, see above.
Index: 1.0.28-1/debian/source/format
===================================================================
--- 1.0.28-1/debian/source/format (nonexistent)
+++ 1.0.28-1/debian/source/format (revision 24)
@@ -0,0 +1 @@
+3.0 (quilt)
Index: 1.0.28-1/debian/rules
===================================================================
--- 1.0.28-1/debian/rules (nonexistent)
+++ 1.0.28-1/debian/rules (revision 24)
@@ -0,0 +1,70 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DESTDIR=$(CURDIR)/debian/ssvnc
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ $(MAKE) config
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+
+ $(MAKE) all
+
+ touch $@
+
+clean: configure-stamp
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ $(MAKE) clean
+ rm vnc_unixsrc/*/Makefile
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+
+ $(MAKE) ROOT=$(DESTDIR) PREFIX=/usr MANDIR=share/man install
+ sed -ri -e 's#/bin/sh#/bin/bash#g' \
+ $(addprefix $(DESTDIR)/usr/lib/ssvnc/,ssvnc ssvnc_cmd util/ss_vncviewer util/ssvnc.tcl)
+
+# Build architecture-independent files here.
+binary-indep:
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
/1.0.28-1/debian/rules
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: 1.0.28-1/debian/README.source
===================================================================
--- 1.0.28-1/debian/README.source (nonexistent)
+++ 1.0.28-1/debian/README.source (revision 24)
@@ -0,0 +1,8 @@
+This package uses dpatch to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build. For basic usage
+information, see
+
+ /usr/share/doc/dpatch/README.source.gz
+
+(after installing dpatch).
Index: 1.0.28-1/debian/links
===================================================================
--- 1.0.28-1/debian/links (nonexistent)
+++ 1.0.28-1/debian/links (revision 24)
@@ -0,0 +1,2 @@
+usr/share/man/man1/ssvnc.1.gz usr/share/man/man1/sshvnc.1.gz
+usr/share/man/man1/ssvnc.1.gz usr/share/man/man1/tsvnc.1.gz
Index: 1.0.28-1/debian/compat
===================================================================
--- 1.0.28-1/debian/compat (nonexistent)
+++ 1.0.28-1/debian/compat (revision 24)
@@ -0,0 +1 @@
+7
Index: 1.0.28-1/debian/watch
===================================================================
--- 1.0.28-1/debian/watch (nonexistent)
+++ 1.0.28-1/debian/watch (revision 24)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/ssvnc/ssvnc-(.*)\.src\.tar\.gz
Index: 1.0.28-1/debian/docs
===================================================================
--- 1.0.28-1/debian/docs (nonexistent)
+++ 1.0.28-1/debian/docs (revision 24)
@@ -0,0 +1,2 @@
+README
+README.src
Index: 1.0.28-1/debian
===================================================================
--- 1.0.28-1/debian (nonexistent)
+++ 1.0.28-1/debian (revision 24)
/1.0.28-1/debian
Property changes:
Added: mergeWithUpstream
## -0,0 +1 ##
+1
\ No newline at end of property