Bug#362089: patch

[Harald Dunkel]

Hi Ola,

I stumbled over this bug report looking for the conflict
between vnc4server and the new Xorg 7.0. It is tagged
"patch" since yesterday, but there is none included, and
no new vnc4server is in incoming either, so hopefully it
is allowed to post my suggestion here?


Regards

Harri


diff -ur vnc4-4.1.1+X4.3.0.old/debian/changelog 
vnc4-4.1.1+X4.3.0/debian/changelog
--- vnc4-4.1.1+X4.3.0.old/debian/changelog      2006-04-14 14:45:29.000000000 
+0200
+++ vnc4-4.1.1+X4.3.0/debian/changelog  2006-04-14 14:46:27.000000000 +0200
@@ -1,3 +1,9 @@
+vnc4 (4.1.1+X4.3.0-4.1) unstable; urgency=low
+
+  * support for new xorg7 infrastructure, closes: #362089.
+
+ -- Harald Dunkel <[EMAIL PROTECTED]>  Fri, 14 Apr 2006 10:40:25 +0200
+
 vnc4 (4.1.1+X4.3.0-4) unstable; urgency=low
 
   * Applied patch from Chris Donoghue <[EMAIL PROTECTED]>.
diff -ur vnc4-4.1.1+X4.3.0.old/debian/control vnc4-4.1.1+X4.3.0/debian/control
--- vnc4-4.1.1+X4.3.0.old/debian/control        2006-04-14 14:45:29.000000000 
+0200
+++ vnc4-4.1.1+X4.3.0/debian/control    2006-04-14 14:46:27.000000000 +0200
@@ -7,7 +7,7 @@
 
 Package: vnc4server
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, vnc4-common | vnc-common, 
xbase-clients, xserver-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, vnc4-common | vnc-common, 
xbase-clients, xserver-common | x11-common
 Provides: vnc-server, x0vnc-server, xserver
 Recommends: xfonts-base
 Suggests: vnc-java
diff -ur vnc4-4.1.1+X4.3.0.old/unix/vncserver vnc4-4.1.1+X4.3.0/unix/vncserver
--- vnc4-4.1.1+X4.3.0.old/unix/vncserver        2006-04-14 14:45:29.000000000 
+0200
+++ vnc4-4.1.1+X4.3.0/unix/vncserver    2006-04-14 14:46:27.000000000 +0200
@@ -153,6 +153,9 @@
 # $cmd .= " -co /usr/lib/X11/rgb";
 #
 
+$cmd .= " -fp 
/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/75dpi/:unscaled,/usr/lib/X11/fonts/Type1,/usr/lib/X11/fonts/75dpi";
+$cmd .= " -co /etc/X11/rgb";
+
 foreach $arg (@ARGV) {
     $cmd .= " " . &quotedString($arg);
 }

signature.asc
Description: OpenPGP digital signature