Subversion Repositories ssvnc

Compare Revisions

Ignore whitespace Rev 5 → Rev 6

/ssvnc/trunk/debian/changelog
5,6 → 5,9
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.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 31 Oct 2009 16:25:59 +0100
 
/ssvnc/trunk/debian/patches/ultraftp_path.dpatch
0,0 → 1,48
#! /bin/sh /usr/share/dpatch/dpatch-run
## utraftp_path.dpatch by Magnus Holmgren <holmgren@debian.org>
##
## DP: Use hardcoded (and correct for the Debian package) path to
## DP: ultraftp.jar if SSVNC_ULTRA_FTP_JAR is unset.
 
@DPATCH@
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: debian/patches/00list
===================================================================
--- debian/patches/00list (revision 5)
+++ debian/patches/00list (revision 6)
@@ -1,2 +1,3 @@
no_openssl
confusing_-h
+ultraftp_path