aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-07 16:00:44 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-07 16:00:44 +0200
commite91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0 (patch)
treea8fbc3bfb442ef8222367b9a5b2285c9e6408fda /debian
parent424c0e8ee3986b886bf2d7617897577a6b84aaed (diff)
parentc69d2ad0fc5f69163c4babc7a356a783aa7ae411 (diff)
downloadnx-libs-e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0.tar.gz
nx-libs-e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0.tar.bz2
nx-libs-e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0.zip
Merge branch 'uli42-pr/various4' into 3.6.x
Attributes GH PR #896: https://github.com/ArcticaProject/nx-libs/pull/896
Diffstat (limited to 'debian')
-rw-r--r--debian/copyright8
-rw-r--r--debian/copyright.in6
-rw-r--r--debian/nx-x11proto-core-dev.install2
-rw-r--r--debian/nx-x11proto-scrnsaver-dev.install1
4 files changed, 1 insertions, 16 deletions
diff --git a/debian/copyright b/debian/copyright
index 9537f2530..324eb31ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -713,9 +713,7 @@ Copyright: 1999-2001, Brian Paul
2005, Brian Paul
License: Expat
-Files: nx-X11/include/XWDFile.h
- nx-X11/include/Xalloca.h
- nx-X11/include/Xauth.h
+Files: nx-X11/include/Xauth.h
nx-X11/include/Xfuncproto.h
nx-X11/include/Xfuncs.h
nx-X11/include/Xos.h
@@ -1337,7 +1335,6 @@ Files: nx-X11/include/DECkeysym.h
nx-X11/programs/Xserver/include/region.h
nx-X11/programs/Xserver/include/regionstr.h
nx-X11/programs/Xserver/include/resource.h
- nx-X11/programs/Xserver/include/rgb.h
nx-X11/programs/Xserver/include/screenint.h
nx-X11/programs/Xserver/include/scrnintstr.h
nx-X11/programs/Xserver/include/selection.h
@@ -1478,10 +1475,8 @@ License: MIT~X11
Files: nx-X11/include/extensions/XKB.h
nx-X11/include/extensions/XKBconfig.h
- nx-X11/include/extensions/XKBfile.h
nx-X11/include/extensions/XKBgeom.h
nx-X11/include/extensions/XKBproto.h
- nx-X11/include/extensions/XKBrules.h
nx-X11/include/extensions/XKBsrv.h
nx-X11/include/extensions/XKBstr.h
nx-X11/include/extensions/XKM.h
@@ -2187,7 +2182,6 @@ License: Expat
Files: nx-X11/include/extensions/saver.h
nx-X11/include/extensions/saverproto.h
- nx-X11/include/extensions/scrnsaver.h
nx-X11/programs/Xserver/Xext/saver.c
Copyright: 1992, X Consortium
License: Expat~NoAdvert
diff --git a/debian/copyright.in b/debian/copyright.in
index bfbe86d90..315d1b1cf 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -7,8 +7,6 @@ Disclaimer: Autogenerated by CDBS
Files: nx-X11/include/DECkeysym.h
nx-X11/include/HPkeysym.h
nx-X11/include/X.h
- nx-X11/include/XWDFile.h
- nx-X11/include/Xalloca.h
nx-X11/include/Xauth.h
nx-X11/include/Xfuncproto.h
nx-X11/include/Xfuncs.h
@@ -381,7 +379,6 @@ Files: nx-X11/include/DECkeysym.h
nx-X11/programs/Xserver/include/region.h
nx-X11/programs/Xserver/include/regionstr.h
nx-X11/programs/Xserver/include/resource.h
- nx-X11/programs/Xserver/include/rgb.h
nx-X11/programs/Xserver/include/screenint.h
nx-X11/programs/Xserver/include/scrnintstr.h
nx-X11/programs/Xserver/include/selection.h
@@ -1517,10 +1514,8 @@ License: NTP (legal disclaimer)
Files: nx-X11/include/extensions/XKB.h
nx-X11/include/extensions/XKBconfig.h
- nx-X11/include/extensions/XKBfile.h
nx-X11/include/extensions/XKBgeom.h
nx-X11/include/extensions/XKBproto.h
- nx-X11/include/extensions/XKBrules.h
nx-X11/include/extensions/XKBsrv.h
nx-X11/include/extensions/XKBstr.h
nx-X11/include/extensions/XKM.h
@@ -2116,7 +2111,6 @@ License: GENERATED FILE
Files: nx-X11/include/extensions/saver.h
nx-X11/include/extensions/saverproto.h
- nx-X11/include/extensions/scrnsaver.h
nx-X11/programs/Xserver/Xext/saver.c
Copyright: 1992, X Consortium
License: MIT/X11 (BSD like)
diff --git a/debian/nx-x11proto-core-dev.install b/debian/nx-x11proto-core-dev.install
index 16228d84e..703b311e6 100644
--- a/debian/nx-x11proto-core-dev.install
+++ b/debian/nx-x11proto-core-dev.install
@@ -3,8 +3,6 @@ usr/include/*/nx-X11/HPkeysym.h
usr/include/*/nx-X11/Sunkeysym.h
usr/include/*/nx-X11/X.h
usr/include/*/nx-X11/XF86keysym.h
-usr/include/*/nx-X11/XWDFile.h
-usr/include/*/nx-X11/Xalloca.h
usr/include/*/nx-X11/Xarch.h
usr/include/*/nx-X11/Xatom.h
usr/include/*/nx-X11/Xdefs.h
diff --git a/debian/nx-x11proto-scrnsaver-dev.install b/debian/nx-x11proto-scrnsaver-dev.install
index 5a04b360b..1ce5992d0 100644
--- a/debian/nx-x11proto-scrnsaver-dev.install
+++ b/debian/nx-x11proto-scrnsaver-dev.install
@@ -1,3 +1,2 @@
usr/include/*/nx-X11/extensions/saver.h
usr/include/*/nx-X11/extensions/saverproto.h
-usr/include/*/nx-X11/extensions/scrnsaver.h