diff -Nurp 7/vnc4-4.1.1+X4.3.0/debian/changelog 9/vnc4-4.1.1+X4.3.0/debian/changelog --- 7/vnc4-4.1.1+X4.3.0/debian/changelog 2006-05-17 17:43:38.000000000 -0400 +++ 9/vnc4-4.1.1+X4.3.0/debian/changelog 2006-05-17 17:40:38.000000000 -0400 @@ -1,3 +1,16 @@ +vnc4 (4.1.1+X4.3.0-9) unstable; urgency=low + + * Final corrections that closes: #363296. + + -- Ola Lundqvist Thu, 27 Apr 2006 07:04:56 +0200 + +vnc4 (4.1.1+X4.3.0-8) unstable; urgency=low + + * Correction in passwd call, closes: #364665. Thanks to + Taco IJsselmuiden for the fix. + + -- Ola Lundqvist Mon, 24 Apr 2006 22:21:12 +0200 + vnc4 (4.1.1+X4.3.0-7) unstable; urgency=low * Applied patch from Andreas Jochens to make it build diff -Nurp 7/vnc4-4.1.1+X4.3.0/unix/vncserver 9/vnc4-4.1.1+X4.3.0/unix/vncserver --- 7/vnc4-4.1.1+X4.3.0/unix/vncserver 2006-05-17 17:43:38.000000000 -0400 +++ 9/vnc4-4.1.1+X4.3.0/unix/vncserver 2006-05-17 17:40:38.000000000 -0400 @@ -82,7 +82,7 @@ if (!$fontPath) { "/usr/X11R6/lib/X11/fonts/Speedo/,". "/usr/X11R6/lib/X11/fonts/misc/,". "/usr/X11R6/lib/X11/fonts/75dpi/,". - "/usr/X11R6/lib/X11/fonts/100dpi/". + "/usr/X11R6/lib/X11/fonts/100dpi/,". "/usr/share/fonts/X11/misc/,". "/usr/share/fonts/X11/Type1/,". "/usr/share/fonts/X11/75dpi/,". @@ -92,7 +92,7 @@ if (!$colorPath) { &ReadXFConfigColor; } if (!$colorPath) { - foreach ("/usr/X11R6/lib/X11/rgb"){ + foreach ("/etc/X11/rgb", "/usr/share/X11/rgb", "/usr/X11R6/lib/X11/rgb"){ $colorPath = $_; last if ( -e "${colorPath}.txt" ); } @@ -189,7 +189,7 @@ if (!-d _ || !-o _ || ($vncUserDirUnderT ($z,$z,$mode) = stat("$vncUserDir/passwd"); if (!(-e "$vncUserDir/passwd") || ($mode & 077)) { warn "\nYou will require a password to access your desktops.\n\n"; - system("vncpasswd -q $vncUserDir/passwd"); + system("vncpasswd $vncUserDir/passwd"); if (($? >> 8) != 0) { exit 1; }