From c350873c7c977efe5210484f04160be45f84ba7e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 21 Jul 2017 12:31:09 +0200 Subject: Convert nx-X11/lib/ build flow from imake to autotools. --- debian/libnx-x11-6.symbols | 6 +++--- debian/libnx-x11-dev.install | 2 ++ debian/nx-x11-common.install | 4 ++-- debian/rules | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols index 0724aac2f..2901c1d83 100644 --- a/debian/libnx-x11-6.symbols +++ b/debian/libnx-x11-6.symbols @@ -874,8 +874,8 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XLockMutex_fn@Base 3.5.0.29 _XLookupKeysym@Base 3.5.0.29 _XLookupString@Base 3.5.0.29 - _XNoticeCreateBitmap@Base 3.5.0.29 - _XNoticePutBitmap@Base 3.5.0.29 +#MISSING: 3.5.99.9# _XNoticeCreateBitmap@Base 3.5.0.29 +#MISSING: 3.5.99.9# _XNoticePutBitmap@Base 3.5.0.29 _XOpenLC@Base 3.5.0.29 _XParseBaseFontNameList@Base 3.5.0.29 _XPollfdCacheAdd@Base 3.5.0.29 @@ -909,7 +909,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XTextHeight@Base 3.5.0.29 _XTranslateKey@Base 3.5.0.29 _XTranslateKeySym@Base 3.5.0.29 - _XTryShapeBitmapCursor@Base 3.5.0.29 +#MISSING: 2:3.5.99.9# _XTryShapeBitmapCursor@Base 3.5.0.29 _XUnknownCopyEventCookie@Base 2:3.5.99.2 _XUnknownNativeEvent@Base 3.5.0.29 _XUnknownWireEvent@Base 3.5.0.29 diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install index 5f9590cbc..169f0f6ef 100644 --- a/debian/libnx-x11-dev.install +++ b/debian/libnx-x11-dev.install @@ -1,4 +1,5 @@ usr/lib/*/libNX_X11.so +usr/lib/*/libNX_X11.a usr/include/*/nx-X11/ImUtil.h usr/include/*/nx-X11/Xauth.h usr/include/*/nx-X11/XKBlib.h @@ -13,3 +14,4 @@ usr/include/*/nx-X11/Xutil.h usr/include/*/nx-X11/cursorfont.h usr/include/*/nx-X11/misc.h usr/include/*/nx-X11/os.h +usr/lib/*/pkgconfig/nx-x11.pc diff --git a/debian/nx-x11-common.install b/debian/nx-x11-common.install index 00880c3d7..ad6c1ef74 100644 --- a/debian/nx-x11-common.install +++ b/debian/nx-x11-common.install @@ -1,3 +1,3 @@ usr/share/nx/SecurityPolicy -usr/share/nx/XErrorDB -usr/share/nx/Xcms.txt +usr/share/nx/X11/XErrorDB +usr/share/nx/X11/Xcms.txt diff --git a/debian/rules b/debian/rules index e0a6b952c..0ef8ab488 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,7 @@ override_dh_install: # remove static libs rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.la rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la + rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libNX_X11.la # remove extras, GL, and other unneeded headers rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/ -- cgit v1.2.3