From 931050cbe3ab6a880bef04aaba362fdf7155136e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Jul 2015 14:46:42 +0200 Subject: debian/libxcomp{,ext,shad}-dev.install.in: Install nxcomp{,ext,shad}.pc file into the corresponding development packages. --- debian/libxcompshad-dev.install.in | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/libxcompshad-dev.install.in') diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install.in index fe11227df..31cc685d2 100644 --- a/debian/libxcompshad-dev.install.in +++ b/debian/libxcompshad-dev.install.in @@ -10,3 +10,4 @@ usr/include/*/nx/Shadow.h usr/include/*/nx/Updater.h usr/include/*/nx/Win.h usr/include/*/nx/X11.h +usr/lib/*/pkgconfig/nxcompshad.pc -- cgit v1.2.3 From f55249dc6e3f01d4c9970af090884cab346ad9b4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Apr 2016 14:20:24 +0200 Subject: nxcomshad/Makefile.in: Only install Shadow.h as publicly available header file. * Also adapt debian/libxcompshad-dev.install.in accordingly. * Also adapt nx-libs.spec accordingly. --- debian/libxcompshad-dev.install.in | 10 ---------- nx-libs.spec | 10 ---------- nxcompshad/Makefile.in | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) (limited to 'debian/libxcompshad-dev.install.in') diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install.in index 31cc685d2..2010f5950 100644 --- a/debian/libxcompshad-dev.install.in +++ b/debian/libxcompshad-dev.install.in @@ -1,13 +1,3 @@ usr/lib/*/libXcompshad.so -usr/include/*/nx/Core.h -usr/include/*/nx/Input.h -usr/include/*/nx/Logger.h -usr/include/*/nx/Manager.h -usr/include/*/nx/Misc.h -usr/include/*/nx/Poller.h -usr/include/*/nx/Regions.h usr/include/*/nx/Shadow.h -usr/include/*/nx/Updater.h -usr/include/*/nx/Win.h -usr/include/*/nx/X11.h usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/nx-libs.spec b/nx-libs.spec index a1074df66..5ce1d2145 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -609,17 +609,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %files -n libXcompshad-devel %defattr(-,root,root) %_libdir/libXcompshad.so -%{_includedir}/nx/Core.h -%{_includedir}/nx/Input.h -%{_includedir}/nx/Logger.h -%{_includedir}/nx/Manager.h -%{_includedir}/nx/Misc.h -%{_includedir}/nx/Poller.h -%{_includedir}/nx/Regions.h %{_includedir}/nx/Shadow.h -%{_includedir}/nx/Updater.h -%{_includedir}/nx/Win.h -%{_includedir}/nx/X11.h %{_libdir}/pkgconfig/nxcompshad.pc %files -n libXcompshad3 diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index f3b68b45a..68bb1fbad 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -210,7 +210,7 @@ install.lib: all $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} - $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) Shadow.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) nxcompshad.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true -- cgit v1.2.3 From 593e15ca1c93c83ae5629de450c2c92f7ca3ab56 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:09:17 +0200 Subject: debian/*: Drop non-multi-arch support (i.e. Debian squeeze, Ubuntu 10.04 and earlier). --- debian/libnx-x11-6.install | 1 + debian/libnx-x11-6.install.in | 1 - debian/libnx-x11-dev.install | 14 ++++++++++++++ debian/libnx-x11-dev.install.in | 14 -------------- debian/libnx-xau-dev.install | 2 ++ debian/libnx-xau-dev.install.in | 2 -- debian/libnx-xau6.install | 1 + debian/libnx-xau6.install.in | 1 - debian/libnx-xext-dev.install | 5 +++++ debian/libnx-xext-dev.install.in | 5 ----- debian/libnx-xext6.install | 1 + debian/libnx-xext6.install.in | 1 - debian/libxcomp-dev.install | 8 ++++++++ debian/libxcomp-dev.install.in | 8 -------- debian/libxcomp3.install | 1 + debian/libxcomp3.install.in | 1 - debian/libxcompext-dev.install | 4 ++++ debian/libxcompext-dev.install.in | 4 ---- debian/libxcompext3.install | 1 + debian/libxcompext3.install.in | 1 - debian/libxcompshad-dev.install | 3 +++ debian/libxcompshad-dev.install.in | 3 --- debian/libxcompshad3.install | 1 + debian/libxcompshad3.install.in | 1 - debian/nx-x11proto-composite-dev.install | 2 ++ debian/nx-x11proto-composite-dev.install.in | 2 -- debian/nx-x11proto-core-dev.install | 23 +++++++++++++++++++++++ debian/nx-x11proto-core-dev.install.in | 23 ----------------------- debian/nx-x11proto-damage-dev.install | 2 ++ debian/nx-x11proto-damage-dev.install.in | 2 -- debian/nx-x11proto-randr-dev.install | 2 ++ debian/nx-x11proto-randr-dev.install.in | 2 -- debian/nx-x11proto-render-dev.install | 3 +++ debian/nx-x11proto-render-dev.install.in | 3 --- debian/nx-x11proto-xext-dev.install | 8 ++++++++ debian/nx-x11proto-xext-dev.install.in | 8 -------- debian/nx-x11proto-xfixes-dev.install | 3 +++ debian/nx-x11proto-xfixes-dev.install.in | 3 --- debian/nx-x11proto-xinerama-dev.install | 2 ++ debian/nx-x11proto-xinerama-dev.install.in | 2 -- debian/rules | 12 ------------ 41 files changed, 87 insertions(+), 99 deletions(-) create mode 100644 debian/libnx-x11-6.install delete mode 100644 debian/libnx-x11-6.install.in create mode 100644 debian/libnx-x11-dev.install delete mode 100644 debian/libnx-x11-dev.install.in create mode 100644 debian/libnx-xau-dev.install delete mode 100644 debian/libnx-xau-dev.install.in create mode 100644 debian/libnx-xau6.install delete mode 100644 debian/libnx-xau6.install.in create mode 100644 debian/libnx-xext-dev.install delete mode 100644 debian/libnx-xext-dev.install.in create mode 100644 debian/libnx-xext6.install delete mode 100644 debian/libnx-xext6.install.in create mode 100644 debian/libxcomp-dev.install delete mode 100644 debian/libxcomp-dev.install.in create mode 100644 debian/libxcomp3.install delete mode 100644 debian/libxcomp3.install.in create mode 100644 debian/libxcompext-dev.install delete mode 100644 debian/libxcompext-dev.install.in create mode 100644 debian/libxcompext3.install delete mode 100644 debian/libxcompext3.install.in create mode 100644 debian/libxcompshad-dev.install delete mode 100644 debian/libxcompshad-dev.install.in create mode 100644 debian/libxcompshad3.install delete mode 100644 debian/libxcompshad3.install.in create mode 100644 debian/nx-x11proto-composite-dev.install delete mode 100644 debian/nx-x11proto-composite-dev.install.in create mode 100644 debian/nx-x11proto-core-dev.install delete mode 100644 debian/nx-x11proto-core-dev.install.in create mode 100644 debian/nx-x11proto-damage-dev.install delete mode 100644 debian/nx-x11proto-damage-dev.install.in create mode 100644 debian/nx-x11proto-randr-dev.install delete mode 100644 debian/nx-x11proto-randr-dev.install.in create mode 100644 debian/nx-x11proto-render-dev.install delete mode 100644 debian/nx-x11proto-render-dev.install.in create mode 100644 debian/nx-x11proto-xext-dev.install delete mode 100644 debian/nx-x11proto-xext-dev.install.in create mode 100644 debian/nx-x11proto-xfixes-dev.install delete mode 100644 debian/nx-x11proto-xfixes-dev.install.in create mode 100644 debian/nx-x11proto-xinerama-dev.install delete mode 100644 debian/nx-x11proto-xinerama-dev.install.in (limited to 'debian/libxcompshad-dev.install.in') diff --git a/debian/libnx-x11-6.install b/debian/libnx-x11-6.install new file mode 100644 index 000000000..4912d749f --- /dev/null +++ b/debian/libnx-x11-6.install @@ -0,0 +1 @@ +usr/lib/*/libNX_X11.so.* diff --git a/debian/libnx-x11-6.install.in b/debian/libnx-x11-6.install.in deleted file mode 100644 index 4912d749f..000000000 --- a/debian/libnx-x11-6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_X11.so.* diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install new file mode 100644 index 000000000..83e2def0e --- /dev/null +++ b/debian/libnx-x11-dev.install @@ -0,0 +1,14 @@ +usr/lib/*/libNX_X11.so +usr/include/*/nx-X11/ImUtil.h +usr/include/*/nx-X11/XKBlib.h +usr/include/*/nx-X11/Xcms.h +usr/include/*/nx-X11/Xlib.h +usr/include/*/nx-X11/XlibConf.h +usr/include/*/nx-X11/Xlibint.h +usr/include/*/nx-X11/Xlocale.h +usr/include/*/nx-X11/Xregion.h +usr/include/*/nx-X11/Xresource.h +usr/include/*/nx-X11/Xutil.h +usr/include/*/nx-X11/cursorfont.h +usr/include/*/nx-X11/misc.h +usr/include/*/nx-X11/os.h diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install.in deleted file mode 100644 index 83e2def0e..000000000 --- a/debian/libnx-x11-dev.install.in +++ /dev/null @@ -1,14 +0,0 @@ -usr/lib/*/libNX_X11.so -usr/include/*/nx-X11/ImUtil.h -usr/include/*/nx-X11/XKBlib.h -usr/include/*/nx-X11/Xcms.h -usr/include/*/nx-X11/Xlib.h -usr/include/*/nx-X11/XlibConf.h -usr/include/*/nx-X11/Xlibint.h -usr/include/*/nx-X11/Xlocale.h -usr/include/*/nx-X11/Xregion.h -usr/include/*/nx-X11/Xresource.h -usr/include/*/nx-X11/Xutil.h -usr/include/*/nx-X11/cursorfont.h -usr/include/*/nx-X11/misc.h -usr/include/*/nx-X11/os.h diff --git a/debian/libnx-xau-dev.install b/debian/libnx-xau-dev.install new file mode 100644 index 000000000..1bf954c00 --- /dev/null +++ b/debian/libnx-xau-dev.install @@ -0,0 +1,2 @@ +usr/lib/*/libNX_Xau.so +usr/include/*/nx-X11/Xauth.h diff --git a/debian/libnx-xau-dev.install.in b/debian/libnx-xau-dev.install.in deleted file mode 100644 index 1bf954c00..000000000 --- a/debian/libnx-xau-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xau.so -usr/include/*/nx-X11/Xauth.h diff --git a/debian/libnx-xau6.install b/debian/libnx-xau6.install new file mode 100644 index 000000000..246377f12 --- /dev/null +++ b/debian/libnx-xau6.install @@ -0,0 +1 @@ +usr/lib/*/libNX_Xau.so.* diff --git a/debian/libnx-xau6.install.in b/debian/libnx-xau6.install.in deleted file mode 100644 index 246377f12..000000000 --- a/debian/libnx-xau6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xau.so.* diff --git a/debian/libnx-xext-dev.install b/debian/libnx-xext-dev.install new file mode 100644 index 000000000..819c82013 --- /dev/null +++ b/debian/libnx-xext-dev.install @@ -0,0 +1,5 @@ +usr/lib/*/libNX_Xext.so +usr/include/*/nx-X11/extensions/XShm.h +usr/include/*/nx-X11/extensions/Xext.h +usr/include/*/nx-X11/extensions/extutil.h +usr/include/*/nx-X11/extensions/shape.h diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in deleted file mode 100644 index 819c82013..000000000 --- a/debian/libnx-xext-dev.install.in +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/*/libNX_Xext.so -usr/include/*/nx-X11/extensions/XShm.h -usr/include/*/nx-X11/extensions/Xext.h -usr/include/*/nx-X11/extensions/extutil.h -usr/include/*/nx-X11/extensions/shape.h diff --git a/debian/libnx-xext6.install b/debian/libnx-xext6.install new file mode 100644 index 000000000..361d951f5 --- /dev/null +++ b/debian/libnx-xext6.install @@ -0,0 +1 @@ +usr/lib/*/libNX_Xext.so.* diff --git a/debian/libnx-xext6.install.in b/debian/libnx-xext6.install.in deleted file mode 100644 index 361d951f5..000000000 --- a/debian/libnx-xext6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xext.so.* diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install new file mode 100644 index 000000000..e27e6ecf0 --- /dev/null +++ b/debian/libxcomp-dev.install @@ -0,0 +1,8 @@ +usr/lib/*/libXcomp.so +usr/include/*/nx/NX.h +usr/include/*/nx/NXalert.h +usr/include/*/nx/NXpack.h +usr/include/*/nx/NXproto.h +usr/include/*/nx/NXvars.h +usr/include/*/nx/MD5.h +usr/lib/*/pkgconfig/nxcomp.pc \ No newline at end of file diff --git a/debian/libxcomp-dev.install.in b/debian/libxcomp-dev.install.in deleted file mode 100644 index e27e6ecf0..000000000 --- a/debian/libxcomp-dev.install.in +++ /dev/null @@ -1,8 +0,0 @@ -usr/lib/*/libXcomp.so -usr/include/*/nx/NX.h -usr/include/*/nx/NXalert.h -usr/include/*/nx/NXpack.h -usr/include/*/nx/NXproto.h -usr/include/*/nx/NXvars.h -usr/include/*/nx/MD5.h -usr/lib/*/pkgconfig/nxcomp.pc \ No newline at end of file diff --git a/debian/libxcomp3.install b/debian/libxcomp3.install new file mode 100644 index 000000000..9b8fa9f15 --- /dev/null +++ b/debian/libxcomp3.install @@ -0,0 +1 @@ +usr/lib/*/libXcomp.so.* diff --git a/debian/libxcomp3.install.in b/debian/libxcomp3.install.in deleted file mode 100644 index 9b8fa9f15..000000000 --- a/debian/libxcomp3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcomp.so.* diff --git a/debian/libxcompext-dev.install b/debian/libxcompext-dev.install new file mode 100644 index 000000000..a31961b99 --- /dev/null +++ b/debian/libxcompext-dev.install @@ -0,0 +1,4 @@ +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 diff --git a/debian/libxcompext-dev.install.in b/debian/libxcompext-dev.install.in deleted file mode 100644 index a31961b99..000000000 --- a/debian/libxcompext-dev.install.in +++ /dev/null @@ -1,4 +0,0 @@ -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 diff --git a/debian/libxcompext3.install b/debian/libxcompext3.install new file mode 100644 index 000000000..b9ac8ebb9 --- /dev/null +++ b/debian/libxcompext3.install @@ -0,0 +1 @@ +usr/lib/*/libXcompext.so.* diff --git a/debian/libxcompext3.install.in b/debian/libxcompext3.install.in deleted file mode 100644 index b9ac8ebb9..000000000 --- a/debian/libxcompext3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcompext.so.* diff --git a/debian/libxcompshad-dev.install b/debian/libxcompshad-dev.install new file mode 100644 index 000000000..2010f5950 --- /dev/null +++ b/debian/libxcompshad-dev.install @@ -0,0 +1,3 @@ +usr/lib/*/libXcompshad.so +usr/include/*/nx/Shadow.h +usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install.in deleted file mode 100644 index 2010f5950..000000000 --- a/debian/libxcompshad-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/libXcompshad.so -usr/include/*/nx/Shadow.h -usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/debian/libxcompshad3.install b/debian/libxcompshad3.install new file mode 100644 index 000000000..6b452b2bd --- /dev/null +++ b/debian/libxcompshad3.install @@ -0,0 +1 @@ +usr/lib/*/libXcompshad*.so.* diff --git a/debian/libxcompshad3.install.in b/debian/libxcompshad3.install.in deleted file mode 100644 index 6b452b2bd..000000000 --- a/debian/libxcompshad3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcompshad*.so.* diff --git a/debian/nx-x11proto-composite-dev.install b/debian/nx-x11proto-composite-dev.install new file mode 100644 index 000000000..cf2c77e36 --- /dev/null +++ b/debian/nx-x11proto-composite-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/composite.h +usr/include/*/nx-X11/extensions/compositeproto.h \ No newline at end of file diff --git a/debian/nx-x11proto-composite-dev.install.in b/debian/nx-x11proto-composite-dev.install.in deleted file mode 100644 index cf2c77e36..000000000 --- a/debian/nx-x11proto-composite-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/composite.h -usr/include/*/nx-X11/extensions/compositeproto.h \ No newline at end of file diff --git a/debian/nx-x11proto-core-dev.install b/debian/nx-x11proto-core-dev.install new file mode 100644 index 000000000..2e99909a8 --- /dev/null +++ b/debian/nx-x11proto-core-dev.install @@ -0,0 +1,23 @@ +usr/include/*/nx-X11/DECkeysym.h +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 +usr/include/*/nx-X11/Xfuncproto.h +usr/include/*/nx-X11/Xfuncs.h +usr/include/*/nx-X11/Xmd.h +usr/include/*/nx-X11/Xos.h +usr/include/*/nx-X11/Xos_r.h +usr/include/*/nx-X11/Xosdefs.h +usr/include/*/nx-X11/Xpoll.h +usr/include/*/nx-X11/Xproto.h +usr/include/*/nx-X11/Xprotostr.h +usr/include/*/nx-X11/Xthreads.h +usr/include/*/nx-X11/ap_keysym.h +usr/include/*/nx-X11/keysym.h +usr/include/*/nx-X11/keysymdef.h diff --git a/debian/nx-x11proto-core-dev.install.in b/debian/nx-x11proto-core-dev.install.in deleted file mode 100644 index 2e99909a8..000000000 --- a/debian/nx-x11proto-core-dev.install.in +++ /dev/null @@ -1,23 +0,0 @@ -usr/include/*/nx-X11/DECkeysym.h -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 -usr/include/*/nx-X11/Xfuncproto.h -usr/include/*/nx-X11/Xfuncs.h -usr/include/*/nx-X11/Xmd.h -usr/include/*/nx-X11/Xos.h -usr/include/*/nx-X11/Xos_r.h -usr/include/*/nx-X11/Xosdefs.h -usr/include/*/nx-X11/Xpoll.h -usr/include/*/nx-X11/Xproto.h -usr/include/*/nx-X11/Xprotostr.h -usr/include/*/nx-X11/Xthreads.h -usr/include/*/nx-X11/ap_keysym.h -usr/include/*/nx-X11/keysym.h -usr/include/*/nx-X11/keysymdef.h diff --git a/debian/nx-x11proto-damage-dev.install b/debian/nx-x11proto-damage-dev.install new file mode 100644 index 000000000..1503260cf --- /dev/null +++ b/debian/nx-x11proto-damage-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/damagewire.h +usr/include/*/nx-X11/extensions/damageproto.h diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install.in deleted file mode 100644 index 1503260cf..000000000 --- a/debian/nx-x11proto-damage-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/damagewire.h -usr/include/*/nx-X11/extensions/damageproto.h diff --git a/debian/nx-x11proto-randr-dev.install b/debian/nx-x11proto-randr-dev.install new file mode 100644 index 000000000..3b30f71d0 --- /dev/null +++ b/debian/nx-x11proto-randr-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/randr.h +usr/include/*/nx-X11/extensions/randrproto.h diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install.in deleted file mode 100644 index 3b30f71d0..000000000 --- a/debian/nx-x11proto-randr-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/randr.h -usr/include/*/nx-X11/extensions/randrproto.h diff --git a/debian/nx-x11proto-render-dev.install b/debian/nx-x11proto-render-dev.install new file mode 100644 index 000000000..f2222d234 --- /dev/null +++ b/debian/nx-x11proto-render-dev.install @@ -0,0 +1,3 @@ +usr/include/*/nx-X11/extensions/render.h +usr/include/*/nx-X11/extensions/renderproto.h + diff --git a/debian/nx-x11proto-render-dev.install.in b/debian/nx-x11proto-render-dev.install.in deleted file mode 100644 index f2222d234..000000000 --- a/debian/nx-x11proto-render-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/*/nx-X11/extensions/render.h -usr/include/*/nx-X11/extensions/renderproto.h - diff --git a/debian/nx-x11proto-xext-dev.install b/debian/nx-x11proto-xext-dev.install new file mode 100644 index 000000000..f34e66519 --- /dev/null +++ b/debian/nx-x11proto-xext-dev.install @@ -0,0 +1,8 @@ +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 +usr/include/*/nx-X11/extensions/Xdbeproto.h diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in deleted file mode 100644 index f34e66519..000000000 --- a/debian/nx-x11proto-xext-dev.install.in +++ /dev/null @@ -1,8 +0,0 @@ -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 -usr/include/*/nx-X11/extensions/Xdbeproto.h diff --git a/debian/nx-x11proto-xfixes-dev.install b/debian/nx-x11proto-xfixes-dev.install new file mode 100644 index 000000000..91eae0306 --- /dev/null +++ b/debian/nx-x11proto-xfixes-dev.install @@ -0,0 +1,3 @@ +usr/include/*/nx-X11/extensions/xfixeswire.h +usr/include/*/nx-X11/extensions/xfixesproto.h + diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install.in deleted file mode 100644 index 91eae0306..000000000 --- a/debian/nx-x11proto-xfixes-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/*/nx-X11/extensions/xfixeswire.h -usr/include/*/nx-X11/extensions/xfixesproto.h - diff --git a/debian/nx-x11proto-xinerama-dev.install b/debian/nx-x11proto-xinerama-dev.install new file mode 100644 index 000000000..2e1efbc63 --- /dev/null +++ b/debian/nx-x11proto-xinerama-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/panoramiXext.h +usr/include/*/nx-X11/extensions/panoramiXproto.h diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in deleted file mode 100644 index 2e1efbc63..000000000 --- a/debian/nx-x11proto-xinerama-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/panoramiXext.h -usr/include/*/nx-X11/extensions/panoramiXproto.h diff --git a/debian/rules b/debian/rules index 275956c9a..f8bec8fc0 100755 --- a/debian/rules +++ b/debian/rules @@ -19,23 +19,11 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure - . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done rm -fR .preserve/ dh_clean override_dh_install: - # handle builds for Debian squeeze (non multi-arch) - . ./replace.sh; set -x; if [ -z "$(DEB_BUILD_MULTIARCH)" ]; then \ - find debian/*.install.in | while read file; do \ - cat $$file | sed -e 's#/\*/#/#g' > $$(string_rep $$file .install.in .install); \ - done; \ - else \ - find debian/*.install.in | while read file; do \ - cat $$file > $$(string_rep $$file .install.in .install); \ - done; \ - fi - # remove static libs rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a -- cgit v1.2.3