Commit 45983d13 authored by Mike Gabriel's avatar Mike Gabriel

Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and not libnx-xinerama1).

parent 0382b401
#!/bin/sh #!/bin/sh
# postinst script for libnx-x11 # postinst script for nxagent
# #
# see: dh_installdeb(1) # see: dh_installdeb(1)
......
#!/bin/sh #!/bin/sh
# prerm script for libnx-xinerama1 # prerm script for nxagent
# #
# see: dh_installdeb(1) # see: dh_installdeb(1)
# summary of how this script can be called: # summary of how this script can be called:
......
...@@ -20,7 +20,7 @@ override_dh_auto_clean: ...@@ -20,7 +20,7 @@ override_dh_auto_clean:
override_dh_clean: override_dh_clean:
rm -f nx*/configure 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 . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done
rm -f debian/libnx-xinerama1.postinst rm -f debian/nxagent.postinst
rm -fR .preserve/ rm -fR .preserve/
dh_clean dh_clean
...@@ -72,8 +72,8 @@ override_dh_auto_install: ...@@ -72,8 +72,8 @@ override_dh_auto_install:
override_dh_auto_build: override_dh_auto_build:
# let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable # let's prep the nxagent.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable
sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst sed debian/nxagent.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/nxagent.postinst
LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel
......
...@@ -664,10 +664,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X ...@@ -664,10 +664,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%dir %{_libdir}/nx/X11 %dir %{_libdir}/nx/X11
%dir %{_datadir}/nx %dir %{_datadir}/nx
%{_datadir}/nx/SecurityPolicy %{_datadir}/nx/SecurityPolicy
%dir %{_libdir}/nx/X11/Xinerama/
%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6
%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6
%{_libdir}/nx/X11/Xinerama/libXinerama.so.1*
%files -n libNX_X11-6 %files -n libNX_X11-6
%defattr(-,root,root) %defattr(-,root,root)
...@@ -912,6 +908,10 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X ...@@ -912,6 +908,10 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%{_datadir}/pixmaps/nxagent.xpm %{_datadir}/pixmaps/nxagent.xpm
%{_datadir}/nx/rgb %{_datadir}/nx/rgb
%{_datadir}/man/man1/nxagent.1* %{_datadir}/man/man1/nxagent.1*
%dir %{_libdir}/nx/X11/Xinerama/
%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6
%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6
%{_libdir}/nx/X11/Xinerama/libXinerama.so.1*
%files -n nxauth %files -n nxauth
%defattr(-,root,root) %defattr(-,root,root)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment