LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File x11vnc-examples.diff of Package x11vnc (Project openSUSE:11.4)

Index: x11vnc-0.9.12/README
===================================================================
--- x11vnc-0.9.12.orig/README
+++ x11vnc-0.9.12/README
@@ -980,7 +980,7 @@ make
        x11vnc to use the -xrandr screen size change trapping code.
      * New remote control query options: pointer_x, pointer_y,
        pointer_same, pointer_root, and pointer_mask. A demo script using
-       them misc/panner.pl is provided.
+       them examples/panner.pl is provided.
      * The -sslScripts option prints out the SSL certificate management
        scripts.
 
@@ -5394,7 +5394,7 @@ xprop -root -f VNC_CONNECT 8s -set VNC_C
    Q-67: Can x11vnc provide a multi-user desktop web login service as an
    Apache CGI or PHP script?
    Yes. See the example script desktop.cgi for ideas. It is in the source
-   tree in the directory x11vnc/misc. It serves x11vnc's SSL enabled Java
+   tree in the directory x11vnc/examples. It serves x11vnc's SSL enabled Java
    Applet to the web browser with the correct connection information for
    the user's virtual desktop (an Xvfb session via -create; be sure to
    add the Xvfb package.) HTTPS/SSL enabled Apache should be used to
@@ -6348,12 +6348,12 @@ EndSection
    down the delays, e.g. "-wait 5" and "-defer 5" (or even a smaller
    setting) to poll and pump things out more quickly.
 
-   See the instructions in "x11vnc/misc/turbovnc/README" for how to build
+   See the instructions in "x11vnc/examples/turbovnc/README" for how to build
    x11vnc with TurboVNC support. You will also need to download the
    TurboJPEG software.
 
    In brief, the steps look like this:
-  cd x11vnc-x.y.z/x11vnc/misc/turbovnc
+  cd x11vnc-x.y.z/x11vnc/examples/turbovnc
   ./apply_turbovnc
   cd ../../..
   env LDFLAGS='-L/DIR -Xlinker --rpath=/DIR' ./configure
@@ -7609,7 +7609,7 @@ minal #2)
 
    Note the -pipeinput helper program could actually control the raw
    framebuffer. In the libvncserver CVS a simple example program
-   x11vnc/misc/slide.pl is provided that demonstrates a simple jpeg
+   x11vnc/examples/slide.pl is provided that demonstrates a simple jpeg
    "slideshow" application. Also the builtin "-pipeinput VID" mode does
    this for webcams and TV capture devices (/dev/video0.)
 
@@ -7619,7 +7619,7 @@ minal #2)
 
    Another example provided in libvncserver CVS is a script to inject
    keystrokes into the Linux console (e.g. the virtual consoles:
-   /dev/tty1, /dev/tty2, etc) in x11vnc/misc/vcinject.pl. It is based on
+   /dev/tty1, /dev/tty2, etc) in x11vnc/examples/vcinject.pl. It is based on
    the vncterm/LinuxVNC.c program also in the libvncserver CVS. So to
    view and interact with VT #2 (assuming it is the active VT) one can
    run something like:
@@ -8937,7 +8937,7 @@ or:
    For inetd.conf, an example is:
   5900 stream tcp6 nowait root /usr/sbin/tcpd /usr/local/bin/x11vnc_wrapper.sh
 
-   We also provide a transitional tool in "x11vnc/misc/inet6to4" that
+   We also provide a transitional tool in "x11vnc/examples/inet6to4" that
    acts as a relay for any IPv4 application to allow connections over
    IPv6. For example:
   inet6to4 5900 localhost:5900
@@ -13794,7 +13794,7 @@ Options:
                        Xdummy:
 
                        The Xdummy wrapper is part of the x11vnc source code
-                       (x11vnc/misc/Xdummy)  It should be available in PATH
+                       (x11vnc/examples/Xdummy)  It should be available in PATH
                        and have run "Xdummy -install" once to create the
                        shared library.  Xdummy only works on Linux.  As of
                        12/2009 it no longer needs to be run as root, and the
Index: x11vnc-0.9.12/configure.ac
===================================================================
--- x11vnc-0.9.12.orig/configure.ac
+++ x11vnc-0.9.12/configure.ac
@@ -810,7 +810,7 @@ if test "$build_x11vnc" = "yes"; then
 	#
 	# configure.ac:690: required file `x11vnc/Makefile.in' not found
 	#
-	AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile])
+	AC_CONFIG_FILES([x11vnc/Makefile x11vnc/examples/Makefile x11vnc/examples/turbovnc/Makefile])
 
 	if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno"; then
 		# need to move local tarball rfb headers aside:
Index: x11vnc-0.9.12/x11vnc/Makefile.am
===================================================================
--- x11vnc-0.9.12.orig/x11vnc/Makefile.am
+++ x11vnc-0.9.12/x11vnc/Makefile.am
@@ -9,8 +9,8 @@ x11vnc_LDFLAGS = -framework ApplicationS
 x11vnc_CFLAGS = -ObjC
 endif
 
-SUBDIRS = misc
-DIST_SUBDIRS = misc
+SUBDIRS = examples
+DIST_SUBDIRS = examples
 
 desktopdir = $(datadir)/applications
 desktop_DATA = x11vnc.desktop
Index: x11vnc-0.9.12/x11vnc/Makefile.in
===================================================================
--- x11vnc-0.9.12.orig/x11vnc/Makefile.in
+++ x11vnc-0.9.12/x11vnc/Makefile.in
@@ -241,8 +241,8 @@ with_ffmpeg = @with_ffmpeg@
 @HAVE_SYSTEM_LIBVNCSERVER_TRUE@LDADD = @SYSTEM_LIBVNCSERVER_LIBS@ @WSOCKLIB@
 @OSX_TRUE@x11vnc_LDFLAGS = -framework ApplicationServices -framework Carbon -framework IOKit -framework Cocoa
 @OSX_TRUE@x11vnc_CFLAGS = -ObjC
-SUBDIRS = misc
-DIST_SUBDIRS = misc
+SUBDIRS = examples
+DIST_SUBDIRS = examples
 desktopdir = $(datadir)/applications
 desktop_DATA = x11vnc.desktop
 man_MANS = x11vnc.1
Index: x11vnc-0.9.12/x11vnc/README
===================================================================
--- x11vnc-0.9.12.orig/x11vnc/README
+++ x11vnc-0.9.12/x11vnc/README
@@ -980,7 +980,7 @@ make
        x11vnc to use the -xrandr screen size change trapping code.
      * New remote control query options: pointer_x, pointer_y,
        pointer_same, pointer_root, and pointer_mask. A demo script using
-       them misc/panner.pl is provided.
+       them examples/panner.pl is provided.
      * The -sslScripts option prints out the SSL certificate management
        scripts.
 
@@ -5394,7 +5394,7 @@ xprop -root -f VNC_CONNECT 8s -set VNC_C
    Q-67: Can x11vnc provide a multi-user desktop web login service as an
    Apache CGI or PHP script?
    Yes. See the example script desktop.cgi for ideas. It is in the source
-   tree in the directory x11vnc/misc. It serves x11vnc's SSL enabled Java
+   tree in the directory x11vnc/examples. It serves x11vnc's SSL enabled Java
    Applet to the web browser with the correct connection information for
    the user's virtual desktop (an Xvfb session via -create; be sure to
    add the Xvfb package.) HTTPS/SSL enabled Apache should be used to
@@ -6348,12 +6348,12 @@ EndSection
    down the delays, e.g. "-wait 5" and "-defer 5" (or even a smaller
    setting) to poll and pump things out more quickly.
 
-   See the instructions in "x11vnc/misc/turbovnc/README" for how to build
+   See the instructions in "x11vnc/examples/turbovnc/README" for how to build
    x11vnc with TurboVNC support. You will also need to download the
    TurboJPEG software.
 
    In brief, the steps look like this:
-  cd x11vnc-x.y.z/x11vnc/misc/turbovnc
+  cd x11vnc-x.y.z/x11vnc/examples/turbovnc
   ./apply_turbovnc
   cd ../../..
   env LDFLAGS='-L/DIR -Xlinker --rpath=/DIR' ./configure
@@ -7609,7 +7609,7 @@ minal #2)
 
    Note the -pipeinput helper program could actually control the raw
    framebuffer. In the libvncserver CVS a simple example program
-   x11vnc/misc/slide.pl is provided that demonstrates a simple jpeg
+   x11vnc/examples/slide.pl is provided that demonstrates a simple jpeg
    "slideshow" application. Also the builtin "-pipeinput VID" mode does
    this for webcams and TV capture devices (/dev/video0.)
 
@@ -7619,7 +7619,7 @@ minal #2)
 
    Another example provided in libvncserver CVS is a script to inject
    keystrokes into the Linux console (e.g. the virtual consoles:
-   /dev/tty1, /dev/tty2, etc) in x11vnc/misc/vcinject.pl. It is based on
+   /dev/tty1, /dev/tty2, etc) in x11vnc/examples/vcinject.pl. It is based on
    the vncterm/LinuxVNC.c program also in the libvncserver CVS. So to
    view and interact with VT #2 (assuming it is the active VT) one can
    run something like:
@@ -8937,7 +8937,7 @@ or:
    For inetd.conf, an example is:
   5900 stream tcp6 nowait root /usr/sbin/tcpd /usr/local/bin/x11vnc_wrapper.sh
 
-   We also provide a transitional tool in "x11vnc/misc/inet6to4" that
+   We also provide a transitional tool in "x11vnc/examples/inet6to4" that
    acts as a relay for any IPv4 application to allow connections over
    IPv6. For example:
   inet6to4 5900 localhost:5900
@@ -13794,7 +13794,7 @@ Options:
                        Xdummy:
 
                        The Xdummy wrapper is part of the x11vnc source code
-                       (x11vnc/misc/Xdummy)  It should be available in PATH
+                       (x11vnc/examples/Xdummy)  It should be available in PATH
                        and have run "Xdummy -install" once to create the
                        shared library.  Xdummy only works on Linux.  As of
                        12/2009 it no longer needs to be run as root, and the
Index: x11vnc-0.9.12/x11vnc/help.c
===================================================================
--- x11vnc-0.9.12.orig/x11vnc/help.c
+++ x11vnc-0.9.12/x11vnc/help.c
@@ -1573,7 +1573,7 @@ void print_help(int mode) {
 "                       Xdummy:\n"
 "\n"
 "                       The Xdummy wrapper is part of the x11vnc source code\n"
-"                       (x11vnc/misc/Xdummy)  It should be available in PATH\n"
+"                       (x11vnc/examples/Xdummy)  It should be available in PATH\n"
 "                       and have run \"Xdummy -install\" once to create the\n"
 "                       shared library.  Xdummy only works on Linux.  As of\n"
 "                       12/2009 it no longer needs to be run as root, and the\n"
Index: x11vnc-0.9.12/x11vnc/misc/turbovnc/README
===================================================================
--- x11vnc-0.9.12.orig/x11vnc/misc/turbovnc/README
+++ x11vnc-0.9.12/x11vnc/misc/turbovnc/README
@@ -45,7 +45,7 @@ QUICK-START:
 
 For those in a hurry:
 
-  cd x11vnc-x.y.z/x11vnc/misc/turbovnc
+  cd x11vnc-x.y.z/x11vnc/examples/turbovnc
   ./apply_turbovnc
   cd ../../..
   env LDFLAGS='-L/DIR -Xlinker --rpath=/DIR' ./configure
@@ -58,7 +58,7 @@ PATCHING AND BUILDING:
 ----------------------
 
 After unpacking your x11vnc-x.y.z.tar.gz tarball cd to the
-x11vnc-x.y.z/x11vnc/misc/turbovnc (where this README file is) and from
+x11vnc-x.y.z/x11vnc/examples/turbovnc (where this README file is) and from
 that directory run:
 
 	./apply_turbovnc
Index: x11vnc-0.9.12/x11vnc/x11vnc.1
===================================================================
--- x11vnc-0.9.12.orig/x11vnc/x11vnc.1
+++ x11vnc-0.9.12/x11vnc/x11vnc.1
@@ -1735,7 +1735,7 @@ By default FINDCREATEDISPLAY will try Xv
 Xdummy:
 .IP
 The Xdummy wrapper is part of the x11vnc source code
-(x11vnc/misc/Xdummy)  It should be available in PATH
+(x11vnc/examples/Xdummy)  It should be available in PATH
 and have run "Xdummy \fB-install"\fR once to create the
 shared library.  Xdummy only works on Linux.  As of
 12/2009 it no longer needs to be run as root, and the