Merge branch 'sunweaver-pr/drop-nxlibint-h' into 3.6.x

debian/libxcompext-dev.install

 usr/lib/*/libXcompext.so
 usr/include/*/nx/NXlib.h
-usr/include/*/nx/NXlibint.h
-usr/lib/*/pkgconfig/nxcompext.pc
\ No newline at end of file
+usr/lib/*/pkgconfig/nxcompext.pc

nx-X11/programs/Xserver/Imakefile

@@ -336,8 +336,7 @@ NX_XCOMP_HEADERS = \
               ../../../nxcomp/NXvars.h
 
 NX_XCOMPEXT_HEADERS =                           \
-              ../../../nxcompext/NXlib.h        \
-              ../../../nxcompext/NXlibint.h
+              ../../../nxcompext/NXlib.h
 
 NX_XCOMPSHAD_HEADERS =                          \
               ../../../nxcompshad/Shadow.h

nx-libs.spec

@@ -488,7 +488,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
 %defattr(-,root,root)
 %_libdir/libXcompext.so
 %{_includedir}/nx/NXlib.h
-%{_includedir}/nx/NXlibint.h
 %{_libdir}/pkgconfig/nxcompext.pc
 
 %files -n libXcompext3

nxcompext/Makefile.in

@@ -200,7 +200,6 @@ uninstall.lib:
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
 	$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
 	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
-	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
 	$(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcompext.pc
 	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 

nxcompext/NXlibint.h

-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXCOMPEXT, NX protocol compression and NX extensions to this software  */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE which comes in the source       */
-/* distribution.                                                          */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-#ifndef NXlibint_H
-#define NXlibint_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "NXvars.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NXlibint_H */