/ssvnc/trunk/debian/control |
---|
2,7 → 2,7 |
Section: net |
Priority: extra |
Maintainer: Magnus Holmgren <holmgren@debian.org> |
Build-Depends: dpatch, debhelper (>= 7), xutils-dev, libxaw7-dev, |
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 |
/ssvnc/trunk/debian/source/format |
---|
0,0 → 1,0 |
3.0 (quilt) |
/ssvnc/trunk/debian/changelog |
---|
2,8 → 2,10 |
* 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. |
-- Magnus Holmgren <holmgren@debian.org> Sun, 06 Feb 2011 19:08:26 +0100 |
-- Magnus Holmgren <holmgren@debian.org> Sun, 06 Feb 2011 21:23:07 +0100 |
ssvnc (1.0.27-1) unstable; urgency=low |
/ssvnc/trunk/debian/patches/confusing_-h.dpatch |
---|
File deleted |
Property changes: |
Deleted: svn:executable |
## -1 +0,0 ## |
-* |
\ No newline at end of property |
Index: trunk/debian/patches/ultraftp_path.dpatch |
=================================================================== |
--- trunk/debian/patches/ultraftp_path.dpatch (revision 18) |
+++ trunk/debian/patches/ultraftp_path.dpatch (nonexistent) |
@@ -1,48 +0,0 @@ |
-#! /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"); |
- } |
- |
- |
/trunk/debian/patches/ultraftp_path.dpatch |
---|
Property changes: |
Deleted: svn:executable |
## -1 +0,0 ## |
-* |
\ No newline at end of property |
Index: trunk/debian/patches/00list |
=================================================================== |
--- trunk/debian/patches/00list (revision 18) |
+++ trunk/debian/patches/00list (nonexistent) |
@@ -1,3 +0,0 @@ |
-confusing_-h |
-ultraftp_path |
-bashisms |
Index: trunk/debian/patches/series |
=================================================================== |
--- trunk/debian/patches/series (nonexistent) |
+++ trunk/debian/patches/series (revision 19) |
@@ -0,0 +1,2 @@ |
+confusing_-h.patch |
+ultraftp_path.patch |
Index: trunk/debian/patches/ultraftp_path.patch |
=================================================================== |
--- trunk/debian/patches/ultraftp_path.patch (nonexistent) |
+++ trunk/debian/patches/ultraftp_path.patch (revision 19) |
@@ -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"); |
+ } |
+ |
+ |
/trunk/debian/patches/ultraftp_path.patch |
---|
Property changes: |
Added: svn:executable |
## -0,0 +1 ## |
+* |
\ No newline at end of property |
Index: trunk/debian/patches/confusing_-h.patch |
=================================================================== |
--- trunk/debian/patches/confusing_-h.patch (nonexistent) |
+++ trunk/debian/patches/confusing_-h.patch (revision 19) |
@@ -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. |
+ |
/trunk/debian/patches/confusing_-h.patch |
---|
Property changes: |
Added: svn:executable |
## -0,0 +1 ## |
+* |
\ No newline at end of property |
Index: trunk/debian/rules |
=================================================================== |
--- trunk/debian/rules (revision 18) |
+++ trunk/debian/rules (revision 19) |
@@ -11,8 +11,6 @@ |
DESTDIR=$(CURDIR)/debian/ssvnc |
-include /usr/share/dpatch/dpatch.make |
- |
configure: configure-stamp |
configure-stamp: |
dh_testdir |
@@ -20,7 +18,7 @@ |
touch configure-stamp |
build: build-stamp |
-build-stamp: configure-stamp patch-stamp |
+build-stamp: configure-stamp |
dh_testdir |
$(MAKE) all |
@@ -27,7 +25,7 @@ |
touch $@ |
-clean: configure-stamp unpatch |
+clean: configure-stamp |
dh_testdir |
dh_testroot |
rm -f build-stamp configure-stamp |
@@ -43,6 +41,8 @@ |
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: |