Merge branch 'sunweaver-pr/enable-mit-screen-saver-extension' into 3.6.x

debian/control

@@ -306,6 +306,23 @@ Description: nx-X11 Render extension wire protocol (dummy package)
  .
  This package can be safely removed.
 
+Package: nx-x11proto-scrnsaver-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+Breaks: nxlibs (<= 3.5.1),
+        libnx-x11-dev (<< 2:3.5.0.29-1~),
+Description: nx-X11 Screen Saver extension wire protocol
+ NX is a software suite which implements very efficient
+ compression of the X11 protocol. This increases performance when
+ using X applications over a network, especially a slow one.
+ .
+ This package provides development headers describing the wire protocol
+ for the MIT-SCREEN-SAVER extension, used to notify the server of client
+ screen saver events.
+
 Package: libnx-mesa-extras-dev
 Section: libdevel
 Architecture: any

debian/nx-x11proto-scrnsaver-dev.install

+usr/include/*/nx-X11/extensions/saver.h
+usr/include/*/nx-X11/extensions/saverproto.h
+usr/include/*/nx-X11/extensions/scrnsaver.h
\ No newline at end of file

nx-X11/config/cf/host.def

@@ -358,7 +358,7 @@
  *
 #define BuildScreenSaverExt	NO
  */
-#define BuildScreenSaverExt	NO
+#define BuildScreenSaverExt	YES
 
 /* 
  * If you don't want to build Xinerama support, uncomment this.

nx-libs.spec

@@ -516,6 +516,9 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
 %{_includedir}/nx-X11/extensions/recordstr.h
 %{_includedir}/nx-X11/extensions/render.h
 %{_includedir}/nx-X11/extensions/renderproto.h
+%{_includedir}/nx-X11/extensions/saver.h
+%{_includedir}/nx-X11/extensions/saverproto.h
+%{_includedir}/nx-X11/extensions/scrnsaver.h
 %{_includedir}/nx-X11/extensions/securstr.h
 %{_includedir}/nx-X11/extensions/syncstr.h
 %{_includedir}/nx-X11/extensions/xcmiscstr.h