diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
| commit | ae0a2bfdeb9ceacb80aa03375353039d425b14b9 (patch) | |
| tree | daec55145477bcec69273e03d5c9ff10c10a4137 /debian | |
| parent | cbe2c0e44f412d07024207f374c0f56684adb088 (diff) | |
| parent | 3b7e5a42f5abecb903a9d730d163d704520efb07 (diff) | |
| download | nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.gz nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.bz2 nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.zip | |
Merge branch 'sunweaver-pr/libnx-x11-autoreconf' into 3.6.x
Attributes GH PR #498: https://github.com/ArcticaProject/nx-libs/pull/498
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/libnx-x11-6.symbols | 6 | ||||
| -rw-r--r-- | debian/libnx-x11-dev.install | 2 | ||||
| -rw-r--r-- | debian/nx-x11-common.install | 4 | ||||
| -rwxr-xr-x | debian/rules | 7 |
5 files changed, 14 insertions, 6 deletions
diff --git a/debian/control b/debian/control index 4211b7705..58b28f12f 100644 --- a/debian/control +++ b/debian/control @@ -73,6 +73,7 @@ Depends: libxcomp3 (= ${binary:Version}), nx-x11-common (<< ${source:Version}.1), nx-x11-common (>= ${source:Version}), + libx11-data, ${misc:Depends}, ${shlibs:Depends} Breaks: 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 864ec35b4..925c98f08 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,11 @@ export LIBEXECDIR = "$(LIBDIR)/nx/bin" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" %: - CONFIGURE="./configure --prefix=/usr --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR) --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt + CONFIGURE="./configure --disable-silent-rules \ + --prefix=/usr \ + --libdir=$(LIBDIR) \ + --includedir=$(INCLUDEDIR) \ + --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports @@ -22,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/ |