From d595125a10f886064fafc28ae8cd93dfed08cabe Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 28 Jun 2016 12:05:01 +0000
Subject: fix wrong bin:package for Xext proto headers: Move dpmsstr.h and
 securstr.h from Xext devel package into proto header package.

---
 debian/control                         | 1 +
 debian/libnx-xext-dev.install.in       | 2 --
 debian/nx-x11proto-xext-dev.install.in | 2 ++
 nx-libs.spec                           | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index d7e6f9a2c..a621bddd7 100644
--- a/debian/control
+++ b/debian/control
@@ -444,6 +444,7 @@ Depends:
  ${misc:Depends},
 Breaks: nxlibs (<= 3.5.1),
         libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
+        libnx-xext-dev (<< 2:3.5.99.0~),
 Description: nx-X11 miscellaneous extension wire protocol
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in
index 4a571b9fd..eb77a30b7 100644
--- a/debian/libnx-xext-dev.install.in
+++ b/debian/libnx-xext-dev.install.in
@@ -2,10 +2,8 @@ usr/lib/*/libNX_Xext.so
 usr/include/*/nx-X11/extensions/XShm.h
 usr/include/*/nx-X11/extensions/Xext.h
 usr/include/*/nx-X11/extensions/dpms.h
-usr/include/*/nx-X11/extensions/dpmsstr.h
 usr/include/*/nx-X11/extensions/extutil.h
 usr/include/*/nx-X11/extensions/security.h
-usr/include/*/nx-X11/extensions/securstr.h
 usr/include/*/nx-X11/extensions/shape.h
 usr/include/*/nx-X11/extensions/sync.h
 usr/include/*/nx-X11/extensions/xtestext1.h
diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in
index f0dfd211e..f34e66519 100644
--- a/debian/nx-x11proto-xext-dev.install.in
+++ b/debian/nx-x11proto-xext-dev.install.in
@@ -1,5 +1,7 @@
+usr/include/*/nx-X11/extensions/dpmsstr.h
 usr/include/*/nx-X11/extensions/xteststr.h
 usr/include/*/nx-X11/extensions/xtestconst.h
+usr/include/*/nx-X11/extensions/securstr.h
 usr/include/*/nx-X11/extensions/shapestr.h
 usr/include/*/nx-X11/extensions/shmstr.h
 usr/include/*/nx-X11/extensions/syncstr.h
diff --git a/nx-libs.spec b/nx-libs.spec
index 3554a65c6..f00088093 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -562,10 +562,8 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
 %{_includedir}/nx-X11/extensions/XShm.h
 %{_includedir}/nx-X11/extensions/Xext.h
 %{_includedir}/nx-X11/extensions/dpms.h
-%{_includedir}/nx-X11/extensions/dpmsstr.h
 %{_includedir}/nx-X11/extensions/extutil.h
 %{_includedir}/nx-X11/extensions/security.h
-%{_includedir}/nx-X11/extensions/securstr.h
 %{_includedir}/nx-X11/extensions/shape.h
 %{_includedir}/nx-X11/extensions/sync.h
 %{_includedir}/nx-X11/extensions/xtestext1.h
@@ -659,12 +657,14 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
 %{_includedir}/nx-X11/extensions/compositeproto.h
 %{_includedir}/nx-X11/extensions/damagewire.h
 %{_includedir}/nx-X11/extensions/damageproto.h
+%{_includedir}/nx-X11/extensions/dpmsstr.h
 %{_includedir}/nx-X11/extensions/panoramiXproto.h
 %{_includedir}/nx-X11/extensions/randr.h
 %{_includedir}/nx-X11/extensions/randrproto.h
 %{_includedir}/nx-X11/extensions/recordstr.h
 %{_includedir}/nx-X11/extensions/render.h
 %{_includedir}/nx-X11/extensions/renderproto.h
+%{_includedir}/nx-X11/extensions/securstr.h
 %{_includedir}/nx-X11/extensions/shapestr.h
 %{_includedir}/nx-X11/extensions/shmstr.h
 %{_includedir}/nx-X11/extensions/syncstr.h
-- 
cgit v1.2.3