Skip to content

N
nx-libs
Commit 7610c0f1 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

debian/*: Adopt from official Debian package where appropriate.

parent c5f3c204
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 117 deletions
debian/control
View file @ 7610c0f1
......@@ -69,10 +69,10 @@ Package: libnx-x11-6
Architecture: any
Multi-Arch: same
Depends:
libx11-data,
libxcomp3 (= ${binary:Version}),
nx-x11-common (<< ${source:Version}.1),
nx-x11-common (>= ${source:Version}),
libx11-data,
${misc:Depends},
${shlibs:Depends}
Breaks:
......
debian/copyright.in
View file @ 7610c0f1
This source diff could not be displayed because it is too large. You can view the blob instead.
debian/libnx-x11-6.symbols
View file @ 7610c0f1
......@@ -134,7 +134,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
XEHeadOfExtensionList@Base 3.5.0.29
XESetBeforeFlush@Base 3.5.0.29
XESetCloseDisplay@Base 3.5.0.29
XESetCopyEventCookie@Base 2:3.5.99.2
XESetCopyEventCookie@Base 3.5.99.2
XESetCopyGC@Base 3.5.0.29
XESetCreateFont@Base 3.5.0.29
XESetCreateGC@Base 3.5.0.29
......@@ -147,7 +147,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
XESetPrintErrorValues@Base 3.5.0.29
XESetWireToError@Base 3.5.0.29
XESetWireToEvent@Base 3.5.0.29
XESetWireToEventCookie@Base 2:3.5.99.2
XESetWireToEventCookie@Base 3.5.99.2
XEmptyRegion@Base 3.5.0.29
XEnableAccessControl@Base 3.5.0.29
XEqualRegion@Base 3.5.0.29
......@@ -174,7 +174,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
XFreeColormap@Base 3.5.0.29
XFreeColors@Base 3.5.0.29
XFreeCursor@Base 3.5.0.29
XFreeEventData@Base 2:3.5.99.2
XFreeEventData@Base 3.5.99.2
XFreeExtensionList@Base 3.5.0.29
XFreeFont@Base 3.5.0.29
XFreeFontInfo@Base 3.5.0.29
......@@ -194,7 +194,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
XGetDefault@Base 3.5.0.29
XGetErrorDatabaseText@Base 3.5.0.29
XGetErrorText@Base 3.5.0.29
XGetEventData@Base 2:3.5.99.2
XGetEventData@Base 3.5.99.2
XGetFontPath@Base 3.5.0.29
XGetFontProperty@Base 3.5.0.29
XGetGCValues@Base 3.5.0.29
......@@ -819,7 +819,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XCloseLC@Base 3.5.0.29
_XColor_to_XcmsRGB@Base 3.5.0.29
_XConnectDisplay@Base 3.5.0.29
_XCopyEventCookie@Base 2:3.5.99.2
_XCopyEventCookie@Base 3.5.99.2
_XCopyToArg@Base 3.5.0.29
_XCreateMutex_fn@Base 3.5.0.29
(arch=amd64 ia64 alpha ppc64 arm64)_XData32@Base 3.5.0.29
......@@ -838,13 +838,13 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XEventsQueued@Base 3.5.0.29
_XF86BigfontFreeFontMetrics@Base 3.5.0.29
_XF86LoadQueryLocaleFont@Base 3.5.0.29
_XFetchEventCookie@Base 2:3.5.99.2
_XFetchEventCookie@Base 3.5.99.2
_XFlush@Base 3.5.0.29
_XFlushGCCache@Base 3.5.0.29
_XFreeAtomTable@Base 3.5.0.29
_XFreeDisplayLock_fn@Base 3.5.0.29
_XFreeDisplayStructure@Base 3.5.0.29
_XFreeEventCookies@Base 2:3.5.99.2
_XFreeEventCookies@Base 3.5.99.2
_XFreeExtData@Base 3.5.0.29
_XFreeMutex_fn@Base 3.5.0.29
_XFreeTemp@Base 3.5.0.29
......@@ -857,7 +857,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XGetScanlinePad@Base 3.5.0.29
_XGetWindowAttributes@Base 3.5.0.29
_XHeadOfDisplayList@Base 3.5.0.29
#MISSING: 3.5.99.2# _XIDHandler@Base 2:3.5.99.2
#MISSING: 3.5.99.2# _XIDHandler@Base 3.5.99.2
_XIMCompileResourceList@Base 3.5.0.29
_XIOError@Base 3.5.0.29
_XIOErrorFunction@Base 3.5.0.29
......@@ -866,7 +866,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XInitImageFuncPtrs@Base 3.5.0.29
_XInitKeysymDB@Base 3.5.0.29
_XInitOM@Base 3.5.0.29
_XIsEventCookie@Base 2:3.5.99.2
_XIsEventCookie@Base 3.5.99.2
_XKeyInitialize@Base 3.5.0.29
_XKeycodeToKeysym@Base 3.5.0.29
_XKeysymToKeycode@Base 3.5.0.29
......@@ -881,7 +881,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XPollfdCacheAdd@Base 3.5.0.29
_XPollfdCacheDel@Base 3.5.0.29
_XPollfdCacheInit@Base 3.5.0.29
_XProcessInternalConnection@Base 2:3.5.99.2
_XProcessInternalConnection@Base 3.5.99.2
_XProcessWindowAttributes@Base 3.5.0.29
_XPutBackEvent@Base 3.5.0.29
(arch=amd64 ia64 alpha ppc64 arm64)_XRead32@Base 3.5.0.29
......@@ -898,22 +898,22 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XSelect@Base 3.5.0.29
_XSend@Base 3.5.0.29
_XSendClientPrefix@Base 3.5.0.29
#MISSING: 3.5.99.2# _XSeqSyncFunction@Base 2:3.5.99.2
#MISSING: 3.5.99.2# _XSeqSyncFunction@Base 3.5.99.2
_XSetClipRectangles@Base 3.5.0.29
_XSetImage@Base 3.5.0.29
_XSetLastRequestRead@Base 3.5.0.29
#MISSING: 3.5.99.2# _XSetPrivSyncFunction@Base 2:3.5.99.2
#MISSING: 3.5.99.2# _XSetSeqSyncFunction@Base 2:3.5.99.2
_XStoreEventCookie@Base 2:3.5.99.2
#MISSING: 3.5.99.2# _XSetPrivSyncFunction@Base 3.5.99.2
#MISSING: 3.5.99.2# _XSetSeqSyncFunction@Base 3.5.99.2
_XStoreEventCookie@Base 3.5.99.2
_XTextHeight16@Base 3.5.0.29
_XTextHeight@Base 3.5.0.29
_XTranslateKey@Base 3.5.0.29
_XTranslateKeySym@Base 3.5.0.29
#MISSING: 2:3.5.99.9# _XTryShapeBitmapCursor@Base 3.5.0.29
_XUnknownCopyEventCookie@Base 2:3.5.99.2
_XUnknownCopyEventCookie@Base 3.5.99.2
_XUnknownNativeEvent@Base 3.5.0.29
_XUnknownWireEvent@Base 3.5.0.29
_XUnknownWireEventCookie@Base 2:3.5.99.2
_XUnknownWireEventCookie@Base 3.5.99.2
_XUnlockMutex_fn@Base 3.5.0.29
_XUnregisterFilter@Base 3.5.0.29
_XUnregisterInternalConnection@Base 3.5.0.29
......@@ -1017,7 +1017,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XimGetICValueData@Base 3.5.0.29
_XimGetIMValueData@Base 3.5.0.29
_XimGetLocaleCode@Base 3.5.0.29
_XimGetMyEndian@Base 2:3.5.99.2
_XimGetMyEndian@Base 3.5.99.2
_XimGetResourceListRec@Base 3.5.0.29
_XimGetResourceListRecByQuark@Base 3.5.0.29
_XimGetWindowEventmask@Base 3.5.0.29
......@@ -1156,7 +1156,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XkeyTable@Base 3.5.0.29
_XlcAddCT@Base 3.5.0.29
_XlcAddCharSet@Base 3.5.0.29
_XlcAddGB18030LocaleConverters@Base 2:3.5.99.2
_XlcAddGB18030LocaleConverters@Base 3.5.99.2
_XlcAddLoader@Base 3.5.0.29
_XlcAddUtf8Converters@Base 3.5.0.29
_XlcAddUtf8LocaleConverters@Base 3.5.0.29
......@@ -1189,7 +1189,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_XlcInitCTInfo@Base 3.5.0.29
_XlcInitLoader@Base 3.5.0.29
_XlcLocaleDirName@Base 3.5.0.29
_XlcLocaleLibDirName@Base 2:3.5.99.2
_XlcLocaleLibDirName@Base 3.5.99.2
_XlcMapOSLocaleName@Base 3.5.0.29
_XlcNCompareISOLatin1@Base 3.5.0.29
_XlcOpenConverter@Base 3.5.0.29
......@@ -1271,4 +1271,4 @@ libNX_X11.so.6 libnx-x11-6 #MINVER#
_qfree@Base 3.5.0.29
#MISSING: 3.5.99.2# in6addr_any@Base 3.5.0.29
read_EncodingInfo@Base 3.5.0.29
xlocaledir@Base 2:3.5.99.2
xlocaledir@Base 3.5.99.2
debian/libnx-x11-dev.install
View file @ 7610c0f1
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
usr/include/*/nx-X11/Xauth.h
usr/include/*/nx-X11/Xcms.h
usr/include/*/nx-X11/Xlib.h
usr/include/*/nx-X11/XlibConf.h
......@@ -14,4 +12,6 @@ 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/*/libNX_X11.a
usr/lib/*/libNX_X11.so
usr/lib/*/pkgconfig/nx-x11.pc
debian/libxcomp-dev.install
View file @ 7610c0f1
usr/lib/*/libXcomp.so
usr/lib/*/libXcomp.a
usr/include/*/nx/MD5.h
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
usr/lib/*/libXcomp.a
usr/lib/*/libXcomp.so
usr/lib/*/pkgconfig/nxcomp.pc
debian/libxcomp3.docs
View file @ 7610c0f1
doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf
doc/nxcomp/README.on-retroactive-DXPC-license
doc/nxcomp/nxcomp-3.6-drops-compat-code-3.4.x-testing.pdf
debian/libxcompshad-dev.install
View file @ 7610c0f1
usr/lib/*/libXcompshad.so
usr/lib/*/libXcompshad.a
usr/include/*/nx/Shadow.h
usr/lib/*/libXcompshad.a
usr/lib/*/libXcompshad.so
usr/lib/*/pkgconfig/nxcompshad.pc
debian/libxcompshad-dev.links
View file @ 7610c0f1
usr/share/doc/libxcompshad3 usr/share/doc/libxcompshad3-dev
debian/nx-x11proto-composite-dev.install
View file @ 7610c0f1
usr/include/*/nx-X11/extensions/composite.h
usr/include/*/nx-X11/extensions/compositeproto.h
\ No newline at end of file
usr/include/*/nx-X11/extensions/compositeproto.h
debian/nx-x11proto-damage-dev.install
View file @ 7610c0f1
usr/include/*/nx-X11/extensions/damagewire.h
usr/include/*/nx-X11/extensions/damageproto.h
usr/include/*/nx-X11/extensions/damagewire.h
debian/nx-x11proto-render-dev.install
View file @ 7610c0f1
usr/include/*/nx-X11/extensions/render.h
usr/include/*/nx-X11/extensions/renderproto.h
debian/nx-x11proto-scrnsaver-dev.install
View file @ 7610c0f1
usr/include/*/nx-X11/extensions/saver.h
usr/include/*/nx-X11/extensions/saverproto.h
usr/include/*/nx-X11/extensions/scrnsaver.h
\ No newline at end of file
usr/include/*/nx-X11/extensions/scrnsaver.h
debian/nx-x11proto-xext-dev.install
View file @ 7610c0f1
usr/include/*/nx-X11/extensions/Xdbeproto.h
usr/include/*/nx-X11/extensions/bigreqstr.h
usr/include/*/nx-X11/extensions/dpms.h
usr/include/*/nx-X11/extensions/dpmsstr.h
......@@ -6,10 +7,9 @@ usr/include/*/nx-X11/extensions/security.h
usr/include/*/nx-X11/extensions/securstr.h
usr/include/*/nx-X11/extensions/sync.h
usr/include/*/nx-X11/extensions/syncstr.h
usr/include/*/nx-X11/extensions/xf86bigfproto.h
usr/include/*/nx-X11/extensions/xf86bigfont.h
usr/include/*/nx-X11/extensions/xcmiscstr.h
usr/include/*/nx-X11/extensions/Xdbeproto.h
usr/include/*/nx-X11/extensions/xf86bigfont.h
usr/include/*/nx-X11/extensions/xf86bigfproto.h
usr/include/*/nx-X11/extensions/xtestconst.h
usr/include/*/nx-X11/extensions/xtestext1.h
usr/include/*/nx-X11/extensions/xteststr.h
debian/nx-x11proto-xfixes-dev.install
View file @ 7610c0f1
usr/include/*/nx-X11/extensions/xfixeswire.h
usr/include/*/nx-X11/extensions/xfixesproto.h
usr/include/*/nx-X11/extensions/xfixeswire.h
debian/nxagent.install
View file @ 7610c0f1
etc/nxagent/keystrokes.cfg
usr/share/nx/VERSION.nxagent
usr/share/man/man1/nxagent.1*
usr/lib/*/nx/X11/
etc/nxagent/nxagent.keyboard
usr/bin/nxagent
usr/lib/*/nx/X11/
usr/share/man/man1/nxagent.1*
usr/share/nx/VERSION.nxagent
usr/share/pixmaps/nxagent.xpm
etc/nxagent/nxagent.keyboard
# FIXME: compatibility symlink, drop for 3.6.0 release
usr/lib/*/nx/bin/nxagent
debian/patches/016_nx-X11_install-location.debian.patch deleted 100644 → 0
View file @ c5f3c204
Description: FHS adaptation for Debian packaging
Abstract:
On Debian, binaries are installed to /usr/<lib>/nx.
.
Also, a fake-libX11 library symlink is placed into
/usr/<lib>/nx/X11.
.
The given paths will be overridden by the Debian packaging
and modified into multi-arch paths.
Forwarded: not-needed
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2017-02-08
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -736,7 +736,7 @@
#define AlternateUsrLibDir YES
#endif
#else
-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11)
+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11)
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir NO
#endif
@@ -754,7 +754,7 @@
#define AlternateUsrDataDir YES
#endif
#else
-#define UsrDataDir Concat4(/usr/local,/,share,/nx)
+#define UsrDataDir Concat4(/usr,/,share,/nx)
#ifndef AlternateUsrDataDir
#define AlternateUsrDataDir NO
#endif
--- a/nx-X11/config/cf/site.def
+++ b/nx-X11/config/cf/site.def
@@ -69,7 +69,7 @@
#ifdef AfterVendorCF
#ifndef ProjectRoot
-#define ProjectRoot /usr/local
+#define ProjectRoot /usr
#endif
/*
debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch deleted 100644 → 0
View file @ c5f3c204
Description: FHS path fix for SecurityPolicy file
This patch is needed on Debian only, not reporting this path
change to upstream.
.
Originally contributed by Marcelo Boveto Shima <marceloshima@gmail.com>.
Forwarded: not-needed
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2012-01-12
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -84,7 +84,7 @@
#ifdef NXAGENT_SERVER
-#define NX_ALTERNATIVEPOLICYFILE "/usr/local/share/nx/SecurityPolicy"
+#define NX_ALTERNATIVEPOLICYFILE "/usr/share/nx/SecurityPolicy"
#endif
debian/patches/series
View file @ 7610c0f1
#401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
016_nx-X11_install-location.debian.patch
102_xserver-xext_set-securitypolicy-path.debian.patch
2001_nx-X11_install-location.debian.patch
2002_xserver-xext_set-securitypolicy-path.debian.patch
debian/rules
View file @ 7610c0f1
......@@ -21,6 +21,53 @@ override_dh_auto_clean:
rm -Rf nx-X11/.build-exports
dh_auto_clean
override_dh_clean:
rm nx-X11/config/Makefile
rm nx-X11/config/cf/Makefile
rm nx-X11/config/cf/date.def
rm nx-X11/config/cf/nxversion.def
rm nx-X11/include/GL/Makefile
rm nx-X11/include/Makefile
rm nx-X11/include/extensions/Makefile
rm nx-X11/programs/Makefile
rm nx-X11/programs/Xserver/GL/Makefile
rm nx-X11/programs/Xserver/GL/glx/Makefile
rm nx-X11/programs/Xserver/GL/mesa/GLcore/Makefile
rm nx-X11/programs/Xserver/GL/mesa/Makefile
rm nx-X11/programs/Xserver/GL/mesa/X/Makefile
rm nx-X11/programs/Xserver/GL/mesa/array_cache/Makefile
rm nx-X11/programs/Xserver/GL/mesa/main/Makefile
rm nx-X11/programs/Xserver/GL/mesa/math/Makefile
rm nx-X11/programs/Xserver/GL/mesa/shader/Makefile
rm nx-X11/programs/Xserver/GL/mesa/shader/grammar/Makefile
rm nx-X11/programs/Xserver/GL/mesa/shader/slang/Makefile
rm nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Makefile
rm nx-X11/programs/Xserver/GL/mesa/swrast/Makefile
rm nx-X11/programs/Xserver/GL/mesa/swrast_setup/Makefile
rm nx-X11/programs/Xserver/GL/mesa/tnl/Makefile
rm nx-X11/programs/Xserver/Makefile
rm nx-X11/programs/Xserver/Xext/Makefile
rm nx-X11/programs/Xserver/Xi/Makefile
rm nx-X11/programs/Xserver/composite/Makefile
rm nx-X11/programs/Xserver/damageext/Makefile
rm nx-X11/programs/Xserver/dbe/Makefile
rm nx-X11/programs/Xserver/dix/Makefile
rm nx-X11/programs/Xserver/fb/Makefile
rm nx-X11/programs/Xserver/hw/nxagent/Makefile
rm nx-X11/programs/Xserver/hw/nxagent/compext/Makefile
rm nx-X11/programs/Xserver/include/Makefile
rm nx-X11/programs/Xserver/mi/Makefile
rm nx-X11/programs/Xserver/miext/cw/Makefile
rm nx-X11/programs/Xserver/miext/damage/Makefile
rm nx-X11/programs/Xserver/os/Makefile
rm nx-X11/programs/Xserver/randr/Makefile
rm nx-X11/programs/Xserver/record/Makefile
rm nx-X11/programs/Xserver/render/Makefile
rm nx-X11/programs/Xserver/xfixes/Makefile
rm nx-X11/programs/Xserver/xkb/Makefile
rm nx-X11/xmakefile
dh_clean
override_dh_install:
# strip static libs and remove .la files
......
debian/watch
View file @ 7610c0f1
version=3
opts=filenamemangle=s/.*\/.*?([\d\.-]+)\.tar\.gz/nx-libs-$1.tar.gz/ \
https://github.com/ArcticaProject/nx-libs/tags .*/archive/.*?([\d\.]+).tar.gz
opts=pgpsigurlmangle=s/$/.asc/ \
http://releases.arctica-project.org/source/nx-libs/nx-libs-(.+)-full\.tar\.gz
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