diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-30 14:34:11 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-30 14:34:11 +0200 |
| commit | 0af0060d5cfdf3593c1f6f20077c85ba353cbef0 (patch) | |
| tree | 4cf8b7cace274df24f7d53fe4ebf8e42b227f83d | |
| parent | 79d49066c11463b62f6ebc3fadf5e7de48f766db (diff) | |
| download | nx-libs-0af0060d5cfdf3593c1f6f20077c85ba353cbef0.tar.gz nx-libs-0af0060d5cfdf3593c1f6f20077c85ba353cbef0.tar.bz2 nx-libs-0af0060d5cfdf3593c1f6f20077c85ba353cbef0.zip | |
debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only delete known files. Fixes RPM build failures.
| -rw-r--r-- | debian/Makefile.nx-libs | 2 | ||||
| -rwxr-xr-x | debian/libnx-xinerama1.postinst.in | 7 | ||||
| -rwxr-xr-x | debian/libnx-xinerama1.prerm | 13 |
3 files changed, 14 insertions, 8 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 9df219e10..87610bfa1 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -139,7 +139,7 @@ install-full: # $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6 # $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 -> /usr/<libdir>/libNX_Xinerama.so.1 # Only create the owned directory here for nx-x11-common. - $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11 + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps $(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \ diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in index 9b88c4b6f..c3706038c 100755 --- a/debian/libnx-xinerama1.postinst.in +++ b/debian/libnx-xinerama1.postinst.in @@ -26,13 +26,8 @@ case "$1" in libdir=/usr/lib/#DEB_BUILD_MULTIARCH# - # Already existent files and directories are not removed. + # Already existent files are not removed. # Users will need to explicitly remove them and (re-) configure this package. - - if test ! -e /usr/lib/nx/X11/Xinerama; then - install -d -m 755 /usr/lib/nx/X11/Xinerama - fi - if test -e $libdir/libX11.so.6; then ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 fi diff --git a/debian/libnx-xinerama1.prerm b/debian/libnx-xinerama1.prerm index 91105d0f8..8cca06c85 100755 --- a/debian/libnx-xinerama1.prerm +++ b/debian/libnx-xinerama1.prerm @@ -20,7 +20,18 @@ set -e case "$1" in remove) if test -d /usr/lib/nx/X11/Xinerama; then - rm -rf /usr/lib/nx/X11/Xinerama + if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + + if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + + + if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then + rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + fi fi ;; deconfigure|upgrade|failed-upgrade) |