From 3983b111a414c9cc88ef7653da4f91cef0ff0482 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:04:16 +0200 Subject: debian/*: Drop not-use-anymore CODE-REDUCTION_* files. --- debian/CODE-REDUCTION_CLEANUP-BACKUPFILES | 0 debian/CODE-REDUCTION_CLEANUP-BRUTAL | 0 debian/CODE-REDUCTION_CLEANUP-UNUSED | 0 debian/CODE-REDUCTION_PRESERVE-INCLUDED | 0 debian/CODE-REDUCTION_PRESERVE-NEEDED | 0 debian/CODE-REDUCTION_PRESERVE-SYMLINKED | 0 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 debian/CODE-REDUCTION_CLEANUP-BACKUPFILES delete mode 100644 debian/CODE-REDUCTION_CLEANUP-BRUTAL delete mode 100644 debian/CODE-REDUCTION_CLEANUP-UNUSED delete mode 100644 debian/CODE-REDUCTION_PRESERVE-INCLUDED delete mode 100644 debian/CODE-REDUCTION_PRESERVE-NEEDED delete mode 100644 debian/CODE-REDUCTION_PRESERVE-SYMLINKED diff --git a/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES b/debian/CODE-REDUCTION_CLEANUP-BACKUPFILES deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_CLEANUP-BRUTAL b/debian/CODE-REDUCTION_CLEANUP-BRUTAL deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_CLEANUP-UNUSED b/debian/CODE-REDUCTION_CLEANUP-UNUSED deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_PRESERVE-INCLUDED b/debian/CODE-REDUCTION_PRESERVE-INCLUDED deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_PRESERVE-NEEDED b/debian/CODE-REDUCTION_PRESERVE-NEEDED deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/CODE-REDUCTION_PRESERVE-SYMLINKED b/debian/CODE-REDUCTION_PRESERVE-SYMLINKED deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.3 From 593e15ca1c93c83ae5629de450c2c92f7ca3ab56 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:09:17 +0200 Subject: debian/*: Drop non-multi-arch support (i.e. Debian squeeze, Ubuntu 10.04 and earlier). --- debian/libnx-x11-6.install | 1 + debian/libnx-x11-6.install.in | 1 - debian/libnx-x11-dev.install | 14 ++++++++++++++ debian/libnx-x11-dev.install.in | 14 -------------- debian/libnx-xau-dev.install | 2 ++ debian/libnx-xau-dev.install.in | 2 -- debian/libnx-xau6.install | 1 + debian/libnx-xau6.install.in | 1 - debian/libnx-xext-dev.install | 5 +++++ debian/libnx-xext-dev.install.in | 5 ----- debian/libnx-xext6.install | 1 + debian/libnx-xext6.install.in | 1 - debian/libxcomp-dev.install | 8 ++++++++ debian/libxcomp-dev.install.in | 8 -------- debian/libxcomp3.install | 1 + debian/libxcomp3.install.in | 1 - debian/libxcompext-dev.install | 4 ++++ debian/libxcompext-dev.install.in | 4 ---- debian/libxcompext3.install | 1 + debian/libxcompext3.install.in | 1 - debian/libxcompshad-dev.install | 3 +++ debian/libxcompshad-dev.install.in | 3 --- debian/libxcompshad3.install | 1 + debian/libxcompshad3.install.in | 1 - debian/nx-x11proto-composite-dev.install | 2 ++ debian/nx-x11proto-composite-dev.install.in | 2 -- debian/nx-x11proto-core-dev.install | 23 +++++++++++++++++++++++ debian/nx-x11proto-core-dev.install.in | 23 ----------------------- debian/nx-x11proto-damage-dev.install | 2 ++ debian/nx-x11proto-damage-dev.install.in | 2 -- debian/nx-x11proto-randr-dev.install | 2 ++ debian/nx-x11proto-randr-dev.install.in | 2 -- debian/nx-x11proto-render-dev.install | 3 +++ debian/nx-x11proto-render-dev.install.in | 3 --- debian/nx-x11proto-xext-dev.install | 8 ++++++++ debian/nx-x11proto-xext-dev.install.in | 8 -------- debian/nx-x11proto-xfixes-dev.install | 3 +++ debian/nx-x11proto-xfixes-dev.install.in | 3 --- debian/nx-x11proto-xinerama-dev.install | 2 ++ debian/nx-x11proto-xinerama-dev.install.in | 2 -- debian/rules | 12 ------------ 41 files changed, 87 insertions(+), 99 deletions(-) create mode 100644 debian/libnx-x11-6.install delete mode 100644 debian/libnx-x11-6.install.in create mode 100644 debian/libnx-x11-dev.install delete mode 100644 debian/libnx-x11-dev.install.in create mode 100644 debian/libnx-xau-dev.install delete mode 100644 debian/libnx-xau-dev.install.in create mode 100644 debian/libnx-xau6.install delete mode 100644 debian/libnx-xau6.install.in create mode 100644 debian/libnx-xext-dev.install delete mode 100644 debian/libnx-xext-dev.install.in create mode 100644 debian/libnx-xext6.install delete mode 100644 debian/libnx-xext6.install.in create mode 100644 debian/libxcomp-dev.install delete mode 100644 debian/libxcomp-dev.install.in create mode 100644 debian/libxcomp3.install delete mode 100644 debian/libxcomp3.install.in create mode 100644 debian/libxcompext-dev.install delete mode 100644 debian/libxcompext-dev.install.in create mode 100644 debian/libxcompext3.install delete mode 100644 debian/libxcompext3.install.in create mode 100644 debian/libxcompshad-dev.install delete mode 100644 debian/libxcompshad-dev.install.in create mode 100644 debian/libxcompshad3.install delete mode 100644 debian/libxcompshad3.install.in create mode 100644 debian/nx-x11proto-composite-dev.install delete mode 100644 debian/nx-x11proto-composite-dev.install.in create mode 100644 debian/nx-x11proto-core-dev.install delete mode 100644 debian/nx-x11proto-core-dev.install.in create mode 100644 debian/nx-x11proto-damage-dev.install delete mode 100644 debian/nx-x11proto-damage-dev.install.in create mode 100644 debian/nx-x11proto-randr-dev.install delete mode 100644 debian/nx-x11proto-randr-dev.install.in create mode 100644 debian/nx-x11proto-render-dev.install delete mode 100644 debian/nx-x11proto-render-dev.install.in create mode 100644 debian/nx-x11proto-xext-dev.install delete mode 100644 debian/nx-x11proto-xext-dev.install.in create mode 100644 debian/nx-x11proto-xfixes-dev.install delete mode 100644 debian/nx-x11proto-xfixes-dev.install.in create mode 100644 debian/nx-x11proto-xinerama-dev.install delete mode 100644 debian/nx-x11proto-xinerama-dev.install.in diff --git a/debian/libnx-x11-6.install b/debian/libnx-x11-6.install new file mode 100644 index 000000000..4912d749f --- /dev/null +++ b/debian/libnx-x11-6.install @@ -0,0 +1 @@ +usr/lib/*/libNX_X11.so.* diff --git a/debian/libnx-x11-6.install.in b/debian/libnx-x11-6.install.in deleted file mode 100644 index 4912d749f..000000000 --- a/debian/libnx-x11-6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_X11.so.* diff --git a/debian/libnx-x11-dev.install b/debian/libnx-x11-dev.install new file mode 100644 index 000000000..83e2def0e --- /dev/null +++ b/debian/libnx-x11-dev.install @@ -0,0 +1,14 @@ +usr/lib/*/libNX_X11.so +usr/include/*/nx-X11/ImUtil.h +usr/include/*/nx-X11/XKBlib.h +usr/include/*/nx-X11/Xcms.h +usr/include/*/nx-X11/Xlib.h +usr/include/*/nx-X11/XlibConf.h +usr/include/*/nx-X11/Xlibint.h +usr/include/*/nx-X11/Xlocale.h +usr/include/*/nx-X11/Xregion.h +usr/include/*/nx-X11/Xresource.h +usr/include/*/nx-X11/Xutil.h +usr/include/*/nx-X11/cursorfont.h +usr/include/*/nx-X11/misc.h +usr/include/*/nx-X11/os.h diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install.in deleted file mode 100644 index 83e2def0e..000000000 --- a/debian/libnx-x11-dev.install.in +++ /dev/null @@ -1,14 +0,0 @@ -usr/lib/*/libNX_X11.so -usr/include/*/nx-X11/ImUtil.h -usr/include/*/nx-X11/XKBlib.h -usr/include/*/nx-X11/Xcms.h -usr/include/*/nx-X11/Xlib.h -usr/include/*/nx-X11/XlibConf.h -usr/include/*/nx-X11/Xlibint.h -usr/include/*/nx-X11/Xlocale.h -usr/include/*/nx-X11/Xregion.h -usr/include/*/nx-X11/Xresource.h -usr/include/*/nx-X11/Xutil.h -usr/include/*/nx-X11/cursorfont.h -usr/include/*/nx-X11/misc.h -usr/include/*/nx-X11/os.h diff --git a/debian/libnx-xau-dev.install b/debian/libnx-xau-dev.install new file mode 100644 index 000000000..1bf954c00 --- /dev/null +++ b/debian/libnx-xau-dev.install @@ -0,0 +1,2 @@ +usr/lib/*/libNX_Xau.so +usr/include/*/nx-X11/Xauth.h diff --git a/debian/libnx-xau-dev.install.in b/debian/libnx-xau-dev.install.in deleted file mode 100644 index 1bf954c00..000000000 --- a/debian/libnx-xau-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xau.so -usr/include/*/nx-X11/Xauth.h diff --git a/debian/libnx-xau6.install b/debian/libnx-xau6.install new file mode 100644 index 000000000..246377f12 --- /dev/null +++ b/debian/libnx-xau6.install @@ -0,0 +1 @@ +usr/lib/*/libNX_Xau.so.* diff --git a/debian/libnx-xau6.install.in b/debian/libnx-xau6.install.in deleted file mode 100644 index 246377f12..000000000 --- a/debian/libnx-xau6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xau.so.* diff --git a/debian/libnx-xext-dev.install b/debian/libnx-xext-dev.install new file mode 100644 index 000000000..819c82013 --- /dev/null +++ b/debian/libnx-xext-dev.install @@ -0,0 +1,5 @@ +usr/lib/*/libNX_Xext.so +usr/include/*/nx-X11/extensions/XShm.h +usr/include/*/nx-X11/extensions/Xext.h +usr/include/*/nx-X11/extensions/extutil.h +usr/include/*/nx-X11/extensions/shape.h diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in deleted file mode 100644 index 819c82013..000000000 --- a/debian/libnx-xext-dev.install.in +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/*/libNX_Xext.so -usr/include/*/nx-X11/extensions/XShm.h -usr/include/*/nx-X11/extensions/Xext.h -usr/include/*/nx-X11/extensions/extutil.h -usr/include/*/nx-X11/extensions/shape.h diff --git a/debian/libnx-xext6.install b/debian/libnx-xext6.install new file mode 100644 index 000000000..361d951f5 --- /dev/null +++ b/debian/libnx-xext6.install @@ -0,0 +1 @@ +usr/lib/*/libNX_Xext.so.* diff --git a/debian/libnx-xext6.install.in b/debian/libnx-xext6.install.in deleted file mode 100644 index 361d951f5..000000000 --- a/debian/libnx-xext6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xext.so.* diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install new file mode 100644 index 000000000..e27e6ecf0 --- /dev/null +++ b/debian/libxcomp-dev.install @@ -0,0 +1,8 @@ +usr/lib/*/libXcomp.so +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 diff --git a/debian/libxcomp-dev.install.in b/debian/libxcomp-dev.install.in deleted file mode 100644 index e27e6ecf0..000000000 --- a/debian/libxcomp-dev.install.in +++ /dev/null @@ -1,8 +0,0 @@ -usr/lib/*/libXcomp.so -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 diff --git a/debian/libxcomp3.install b/debian/libxcomp3.install new file mode 100644 index 000000000..9b8fa9f15 --- /dev/null +++ b/debian/libxcomp3.install @@ -0,0 +1 @@ +usr/lib/*/libXcomp.so.* diff --git a/debian/libxcomp3.install.in b/debian/libxcomp3.install.in deleted file mode 100644 index 9b8fa9f15..000000000 --- a/debian/libxcomp3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcomp.so.* diff --git a/debian/libxcompext-dev.install b/debian/libxcompext-dev.install new file mode 100644 index 000000000..a31961b99 --- /dev/null +++ b/debian/libxcompext-dev.install @@ -0,0 +1,4 @@ +usr/lib/*/libXcompext.so +usr/include/*/nx/NXlib.h +usr/include/*/nx/NXlibint.h +usr/lib/*/pkgconfig/nxcompext.pc \ No newline at end of file diff --git a/debian/libxcompext-dev.install.in b/debian/libxcompext-dev.install.in deleted file mode 100644 index a31961b99..000000000 --- a/debian/libxcompext-dev.install.in +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/*/libXcompext.so -usr/include/*/nx/NXlib.h -usr/include/*/nx/NXlibint.h -usr/lib/*/pkgconfig/nxcompext.pc \ No newline at end of file diff --git a/debian/libxcompext3.install b/debian/libxcompext3.install new file mode 100644 index 000000000..b9ac8ebb9 --- /dev/null +++ b/debian/libxcompext3.install @@ -0,0 +1 @@ +usr/lib/*/libXcompext.so.* diff --git a/debian/libxcompext3.install.in b/debian/libxcompext3.install.in deleted file mode 100644 index b9ac8ebb9..000000000 --- a/debian/libxcompext3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcompext.so.* diff --git a/debian/libxcompshad-dev.install b/debian/libxcompshad-dev.install new file mode 100644 index 000000000..2010f5950 --- /dev/null +++ b/debian/libxcompshad-dev.install @@ -0,0 +1,3 @@ +usr/lib/*/libXcompshad.so +usr/include/*/nx/Shadow.h +usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install.in deleted file mode 100644 index 2010f5950..000000000 --- a/debian/libxcompshad-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/libXcompshad.so -usr/include/*/nx/Shadow.h -usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/debian/libxcompshad3.install b/debian/libxcompshad3.install new file mode 100644 index 000000000..6b452b2bd --- /dev/null +++ b/debian/libxcompshad3.install @@ -0,0 +1 @@ +usr/lib/*/libXcompshad*.so.* diff --git a/debian/libxcompshad3.install.in b/debian/libxcompshad3.install.in deleted file mode 100644 index 6b452b2bd..000000000 --- a/debian/libxcompshad3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libXcompshad*.so.* diff --git a/debian/nx-x11proto-composite-dev.install b/debian/nx-x11proto-composite-dev.install new file mode 100644 index 000000000..cf2c77e36 --- /dev/null +++ b/debian/nx-x11proto-composite-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/composite.h +usr/include/*/nx-X11/extensions/compositeproto.h \ No newline at end of file diff --git a/debian/nx-x11proto-composite-dev.install.in b/debian/nx-x11proto-composite-dev.install.in deleted file mode 100644 index cf2c77e36..000000000 --- a/debian/nx-x11proto-composite-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/composite.h -usr/include/*/nx-X11/extensions/compositeproto.h \ No newline at end of file diff --git a/debian/nx-x11proto-core-dev.install b/debian/nx-x11proto-core-dev.install new file mode 100644 index 000000000..2e99909a8 --- /dev/null +++ b/debian/nx-x11proto-core-dev.install @@ -0,0 +1,23 @@ +usr/include/*/nx-X11/DECkeysym.h +usr/include/*/nx-X11/HPkeysym.h +usr/include/*/nx-X11/Sunkeysym.h +usr/include/*/nx-X11/X.h +usr/include/*/nx-X11/XF86keysym.h +usr/include/*/nx-X11/XWDFile.h +usr/include/*/nx-X11/Xalloca.h +usr/include/*/nx-X11/Xarch.h +usr/include/*/nx-X11/Xatom.h +usr/include/*/nx-X11/Xdefs.h +usr/include/*/nx-X11/Xfuncproto.h +usr/include/*/nx-X11/Xfuncs.h +usr/include/*/nx-X11/Xmd.h +usr/include/*/nx-X11/Xos.h +usr/include/*/nx-X11/Xos_r.h +usr/include/*/nx-X11/Xosdefs.h +usr/include/*/nx-X11/Xpoll.h +usr/include/*/nx-X11/Xproto.h +usr/include/*/nx-X11/Xprotostr.h +usr/include/*/nx-X11/Xthreads.h +usr/include/*/nx-X11/ap_keysym.h +usr/include/*/nx-X11/keysym.h +usr/include/*/nx-X11/keysymdef.h diff --git a/debian/nx-x11proto-core-dev.install.in b/debian/nx-x11proto-core-dev.install.in deleted file mode 100644 index 2e99909a8..000000000 --- a/debian/nx-x11proto-core-dev.install.in +++ /dev/null @@ -1,23 +0,0 @@ -usr/include/*/nx-X11/DECkeysym.h -usr/include/*/nx-X11/HPkeysym.h -usr/include/*/nx-X11/Sunkeysym.h -usr/include/*/nx-X11/X.h -usr/include/*/nx-X11/XF86keysym.h -usr/include/*/nx-X11/XWDFile.h -usr/include/*/nx-X11/Xalloca.h -usr/include/*/nx-X11/Xarch.h -usr/include/*/nx-X11/Xatom.h -usr/include/*/nx-X11/Xdefs.h -usr/include/*/nx-X11/Xfuncproto.h -usr/include/*/nx-X11/Xfuncs.h -usr/include/*/nx-X11/Xmd.h -usr/include/*/nx-X11/Xos.h -usr/include/*/nx-X11/Xos_r.h -usr/include/*/nx-X11/Xosdefs.h -usr/include/*/nx-X11/Xpoll.h -usr/include/*/nx-X11/Xproto.h -usr/include/*/nx-X11/Xprotostr.h -usr/include/*/nx-X11/Xthreads.h -usr/include/*/nx-X11/ap_keysym.h -usr/include/*/nx-X11/keysym.h -usr/include/*/nx-X11/keysymdef.h diff --git a/debian/nx-x11proto-damage-dev.install b/debian/nx-x11proto-damage-dev.install new file mode 100644 index 000000000..1503260cf --- /dev/null +++ b/debian/nx-x11proto-damage-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/damagewire.h +usr/include/*/nx-X11/extensions/damageproto.h diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install.in deleted file mode 100644 index 1503260cf..000000000 --- a/debian/nx-x11proto-damage-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/damagewire.h -usr/include/*/nx-X11/extensions/damageproto.h diff --git a/debian/nx-x11proto-randr-dev.install b/debian/nx-x11proto-randr-dev.install new file mode 100644 index 000000000..3b30f71d0 --- /dev/null +++ b/debian/nx-x11proto-randr-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/randr.h +usr/include/*/nx-X11/extensions/randrproto.h diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install.in deleted file mode 100644 index 3b30f71d0..000000000 --- a/debian/nx-x11proto-randr-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/randr.h -usr/include/*/nx-X11/extensions/randrproto.h diff --git a/debian/nx-x11proto-render-dev.install b/debian/nx-x11proto-render-dev.install new file mode 100644 index 000000000..f2222d234 --- /dev/null +++ b/debian/nx-x11proto-render-dev.install @@ -0,0 +1,3 @@ +usr/include/*/nx-X11/extensions/render.h +usr/include/*/nx-X11/extensions/renderproto.h + diff --git a/debian/nx-x11proto-render-dev.install.in b/debian/nx-x11proto-render-dev.install.in deleted file mode 100644 index f2222d234..000000000 --- a/debian/nx-x11proto-render-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/*/nx-X11/extensions/render.h -usr/include/*/nx-X11/extensions/renderproto.h - diff --git a/debian/nx-x11proto-xext-dev.install b/debian/nx-x11proto-xext-dev.install new file mode 100644 index 000000000..f34e66519 --- /dev/null +++ b/debian/nx-x11proto-xext-dev.install @@ -0,0 +1,8 @@ +usr/include/*/nx-X11/extensions/dpmsstr.h +usr/include/*/nx-X11/extensions/xteststr.h +usr/include/*/nx-X11/extensions/xtestconst.h +usr/include/*/nx-X11/extensions/securstr.h +usr/include/*/nx-X11/extensions/shapestr.h +usr/include/*/nx-X11/extensions/shmstr.h +usr/include/*/nx-X11/extensions/syncstr.h +usr/include/*/nx-X11/extensions/Xdbeproto.h diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in deleted file mode 100644 index f34e66519..000000000 --- a/debian/nx-x11proto-xext-dev.install.in +++ /dev/null @@ -1,8 +0,0 @@ -usr/include/*/nx-X11/extensions/dpmsstr.h -usr/include/*/nx-X11/extensions/xteststr.h -usr/include/*/nx-X11/extensions/xtestconst.h -usr/include/*/nx-X11/extensions/securstr.h -usr/include/*/nx-X11/extensions/shapestr.h -usr/include/*/nx-X11/extensions/shmstr.h -usr/include/*/nx-X11/extensions/syncstr.h -usr/include/*/nx-X11/extensions/Xdbeproto.h diff --git a/debian/nx-x11proto-xfixes-dev.install b/debian/nx-x11proto-xfixes-dev.install new file mode 100644 index 000000000..91eae0306 --- /dev/null +++ b/debian/nx-x11proto-xfixes-dev.install @@ -0,0 +1,3 @@ +usr/include/*/nx-X11/extensions/xfixeswire.h +usr/include/*/nx-X11/extensions/xfixesproto.h + diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install.in deleted file mode 100644 index 91eae0306..000000000 --- a/debian/nx-x11proto-xfixes-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/*/nx-X11/extensions/xfixeswire.h -usr/include/*/nx-X11/extensions/xfixesproto.h - diff --git a/debian/nx-x11proto-xinerama-dev.install b/debian/nx-x11proto-xinerama-dev.install new file mode 100644 index 000000000..2e1efbc63 --- /dev/null +++ b/debian/nx-x11proto-xinerama-dev.install @@ -0,0 +1,2 @@ +usr/include/*/nx-X11/extensions/panoramiXext.h +usr/include/*/nx-X11/extensions/panoramiXproto.h diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in deleted file mode 100644 index 2e1efbc63..000000000 --- a/debian/nx-x11proto-xinerama-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx-X11/extensions/panoramiXext.h -usr/include/*/nx-X11/extensions/panoramiXproto.h diff --git a/debian/rules b/debian/rules index 275956c9a..f8bec8fc0 100755 --- a/debian/rules +++ b/debian/rules @@ -19,23 +19,11 @@ override_dh_auto_clean: override_dh_clean: 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 rm -fR .preserve/ dh_clean override_dh_install: - # handle builds for Debian squeeze (non multi-arch) - . ./replace.sh; set -x; if [ -z "$(DEB_BUILD_MULTIARCH)" ]; then \ - find debian/*.install.in | while read file; do \ - cat $$file | sed -e 's#/\*/#/#g' > $$(string_rep $$file .install.in .install); \ - done; \ - else \ - find debian/*.install.in | while read file; do \ - cat $$file > $$(string_rep $$file .install.in .install); \ - done; \ - fi - # remove static libs rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a -- cgit v1.2.3 From 908b930c9e0cb336e6f18d2c8ff7d19f52f7accc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:10:49 +0200 Subject: debian/rules: Don't attempt at removing $(CURDIR)/.preserve/. Not needed anymore since we removed the CODE-REDUCTION_* hacks from debian/rules. --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index f8bec8fc0..ec7616f7a 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure - rm -fR .preserve/ dh_clean override_dh_install: -- cgit v1.2.3 From 6b423eefd68f54927e59b4dd25a1b73a7f662461 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:12:33 +0200 Subject: roll-tarball.sh: Don't ship doc/X11-symbols/ in the lite (proxy-only) tarball derived from the nx-libs code tree. --- debian/roll-tarballs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 24f7b07b0..e735e8913 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -106,6 +106,7 @@ else rm -Rf "nx-X11"* rm -Rf "etc"* rm -Rf "doc/nx-X11_vs_XOrg69_patches"* + rm -Rf "doc/X11-symbols"* rm -f "README.keystrokes" cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do -- cgit v1.2.3 From b4d7b9989aab4aa4c47baa785a9ecbe23eaef63b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 10:26:15 +0200 Subject: debian/control: Drop various not-used-anymore libNX_* related packages. Add B:/R: to libnx-x11-{6,dev,6-dbg) to uninstall those package when upgrading to nx-libs 3.6.x. --- debian/control | 560 ++++++--------------------------------------------------- 1 file changed, 54 insertions(+), 506 deletions(-) diff --git a/debian/control b/debian/control index e9e7f7d18..5fe9eceb8 100644 --- a/debian/control +++ b/debian/control @@ -65,20 +65,6 @@ Description: nx-X11 core wire protocol and auxiliary headers for the core nx-X11 protocol, and also provides a number of utility headers, used to abstract OS-specific functions. -Package: libnx-x11 -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, - libnx-x11-6 (>= ${source:Version}), libnx-x11-6 (<< ${source:Version}.1), -Description: nx-X11 client-side library (transitional dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package is a transitional dummy package and can be safely removed - (inducing transition of libnx-x11 to libnx-x11-6). - Package: libnx-x11-6 Architecture: any Multi-Arch: same @@ -90,7 +76,25 @@ Depends: nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1), Breaks: nxlibs (<= 3.5.1), libnx-x11 (<< 2:3.5.0.29-1~), + libnx-xcomposite1 (<< 2:3.6.0.0), + libnx-xdamage1 (<< 2:3.6.0.0), + libnx-xdmcp6 (<< 2:3.6.0.0), + libnx-xfixes3 (<< 2:3.6.0.0), + libnx-xinerama1 (<< 2:3.6.0.0), + libnx-xpm4 (<< 2:3.6.0.0), + libnx-xrandr2 (<< 2:3.6.0.0), + libnx-xrender1 (<< 2:3.6.0.0), + libnx-xtst6 (<< 2:3.6.0.0), Replaces: nxlibs, + libnx-xcomposite1, + libnx-xdamage1, + libnx-xdmcp6, + libnx-xfixes3, + libnx-xinerama1, + libnx-xpm4, + libnx-xrandr2, + libnx-xrender1, + libnx-xtst6, Description: nx-X11 client-side library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -104,7 +108,25 @@ Provides: libnx-x11-6-dev Section: libdevel Architecture: any Breaks: nxlibs-dev (<=3.5.1), + libnx-xcomposite-dev (<< 2:3.6.0.0), + libnx-xdamage-dev (<< 2:3.6.0.0), + libnx-xdmcp-dev (<< 2:3.6.0.0), + libnx-xfixes-dev (<< 2:3.6.0.0), + libnx-xinerama-dev (<< 2:3.6.0.0), + libnx-xpm-dev (<< 2:3.6.0.0), + libnx-xrandr-dev (<< 2:3.6.0.0), + libnx-xrender-dev (<< 2:3.6.0.0), + libnx-xtst-dev (<< 2:3.6.0.0), Replaces: nxlibs-dev, + libnx-xcomposite-dev, + libnx-xdamage-dev, + libnx-xdmcp-dev, + libnx-xfixes-dev, + libnx-xinerama-dev, + libnx-xpm-dev, + libnx-xrandr-dev, + libnx-xrender-dev, + libnx-xtst-dev, Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends}, @@ -126,7 +148,25 @@ Depends: ${misc:Depends}, Section: debug Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), + libnx-xcomposite1-dbg (<< 2:3.6.0.0), + libnx-xdamage1-dbg (<< 2:3.6.0.0), + libnx-xdmcp6-dbg (<< 2:3.6.0.0), + libnx-xfixes3-dbg (<< 2:3.6.0.0), + libnx-xinerama1-dbg (<< 2:3.6.0.0), + libnx-xpm4-dbg (<< 2:3.6.0.0), + libnx-xrandr2-dbg (<< 2:3.6.0.0), + libnx-xrender1-dbg (<< 2:3.6.0.0), + libnx-xtst6-dbg (<< 2:3.6.0.0), Replaces: nx-x11-dbg, + libnx-xcomposite1-dbg, + libnx-xdamage1-dbg, + libnx-xdmcp6-dbg, + libnx-xfixes3-dbg, + libnx-xinerama1-dbg, + libnx-xpm4-dbg, + libnx-xrandr2-dbg, + libnx-xrender1-dbg, + libnx-xtst6-dbg, Description: nx-X11 client-side library (debug package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when @@ -196,42 +236,6 @@ Description: nx-X11 authorisation library (debug package) . This package contains debug symbols for this library. -Package: libnx-xcomposite1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Composite extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xcomposite.so.1 library. With - recent versions of NX, the system-wide installed libXcomposite gets - used. - . - This package can be safely removed. - -Package: libnx-xcomposite-dev -Provides: libnx-xcomposite1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Composite extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xcomposite.so.1 - library. With recent versions of NX, the system-wide installed - libXcomposite gets used. - . - This package can be safely removed. - Package: nx-x11proto-composite-dev Section: libdevel Architecture: any @@ -249,60 +253,6 @@ Description: nx-X11 Composite extension wire protocol for the Composite extension in nx-X11, used to let arbitrary client programs control drawing of the final image. -Package: libnx-xcomposite1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Composite extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the debug symbols for the obsoleted - libNX_Xcomposite.so.1 library. With recent versions of NX, the - system-wide installed libXcomposite gets used. - . - This package can be safely removed. - -Package: libnx-xdamage1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 damaged region extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xdamage.so.1 library. With - recent versions of NX, the system-wide installed libXdamage gets used. - . - This package can be safely removed. - -Package: libnx-xdamage-dev -Provides: libnx-xdamage1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 damaged region extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xdamage.so.1 - library. With recent versions of NX, the system-wide installed libXdamage - gets used. - . - This package can be safely removed. - Package: nx-x11proto-damage-dev Section: libdevel Architecture: any @@ -320,79 +270,6 @@ Description: nx-X11 Damage extension wire protocol (dummy package) . This package can be safely removed. -Package: libnx-xdamage1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 damaged region extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the - libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide - installed libXdamage gets used. - . - This package can be safely removed. - -Package: libnx-xdmcp6 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Display Manager Control Protocol library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xdmcp.so.6 library. With - recent versions of NX, the system-wide installed libXdmcp gets used. - . - This package can be safely removed. - -Package: libnx-xdmcp-dev -Provides: libnx-xdmcp6-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Display Manager Control Protocol library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xdmcp.so.6 - library. With recent versions of NX, the system-wide installed libXdmcp - gets used. - . - This package can be safely removed. - -Package: libnx-xdmcp6-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Display Manager Control Protocol library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xdmcp.so.6 - library. With recent versions of NX, the system-wide installed libXdmcp - gets used. - . - This package can be safely removed. - Package: libnx-xext6 Architecture: any Multi-Arch: same @@ -474,41 +351,6 @@ Description: nx-X11 miscellaneous extension library (debug package) . This package contains debug symbols for this library. -Package: libnx-xfixes3 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 miscellaneous 'fixes' extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xfixes.so.3 library. With - recent versions of NX, the system-wide installed libXfixes gets used. - . - This package can be safely removed. - -Package: libnx-xfixes-dev -Provides: libnx-xfixes3-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 miscellaneous 'fixes' extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xfixes.so.3 - library. With recent versions of NX, the system-wide installed - libXfixes gets used. - . - This package can be safely removed. - Package: nx-x11proto-xfixes-dev Section: libdevel Architecture: any @@ -525,60 +367,6 @@ Description: nx-X11 'xfixes' extension wire protocol This package provides development headers describing the wire protocol for the XFIXES extension. -Package: libnx-xfixes3-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 miscellaneous 'fixes' extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xfixes.so.3 - library. With recent versions of NX, the system-wide installed libXfixes - gets used. - . - This package can be safely removed. - -Package: libnx-xinerama1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Xinerama extension library - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xinerama.so.1 library. - Xinerama support in NX has been moved into nxagent whereas X-Clients - can now use the libXinerama library shipped with X.Org. - . - This package can be safely removed. - -Package: libnx-xinerama-dev -Provides: libnx-xinerama1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Xinerama extension library (development headers) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xinerama.so.1 - library. - . - This package can be safely removed. - Package: nx-x11proto-xinerama-dev Section: libdevel Architecture: any @@ -595,119 +383,6 @@ Description: nx-X11 Xinerama extension wire protocol . This package can be safely removed. -Package: libnx-xinerama1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - libnx-xinerama1 (= ${binary:Version}), - ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 Xinerama extension library (debug package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - libNX_Xinerama provides an X Window System client interface to the XINERAMA - extension to the X protocol. - . - This package removes the obsoleted debug symbols for the libNX_Xinerama.so.1 - library. - . - This package can be safely removed. - -Package: libnx-xpm4 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 pixmap library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xpm.so.4 library. With - recent versions of NX, the system-wide installed libXpm gets used. - . - This package can be safely removed. - -Package: libnx-xpm-dev -Provides: libnx-xpm4-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 pixmap library (development headers, dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xpm.so.4 - library. With recent versions of NX, the system-wide installed libXpm - gets used. - . - This package can be safely removed. - -Package: libnx-xpm4-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~), -Description: nx-X11 pixmap library (debug package, dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xpm.so.4 - library. With recent versions of NX, the system-wide installed libXpm - gets used. - . - This package can be safely removed. - -Package: libnx-xrandr2 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 RandR extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xrandr.so.2 library. With - recent versions of NX, the system-wide installed libXrandr gets used. - . - This package can be safely removed. - -Package: libnx-xrandr-dev -Provides: libnx-xrandr2-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 RandR extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xrandr.so.2 - library. With recent versions of NX, the system-wide installed libXrandr - gets used. - . - This package can be safely removed. - Package: nx-x11proto-randr-dev Section: libdevel Architecture: any @@ -725,60 +400,6 @@ Description: nx-X11 RandR extension wire protocol (dummy package) . This package can be safely removed. -Package: libnx-xrandr2-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 RandR extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xrandr.so.2 - library. With recent versions of NX, the system-wide installed libXrandr - gets used. - . - This package can be safely removed. - -Package: libnx-xrender1 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Rendering Extension client library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xrender.so.1 library. With - recent versions of NX, the system-wide installed libXrender gets used. - . - This package can be safely removed. - -Package: libnx-xrender-dev -Provides: libnx-xrender1-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Rendering Extension client library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xrender.so.1 - library. With recent versions of NX, the system-wide installed libXrender - gets used. - . - This package can be safely removed. - Package: nx-x11proto-render-dev Section: libdevel Architecture: any @@ -796,79 +417,6 @@ Description: nx-X11 Render extension wire protocol (dummy package) . This package can be safely removed. -Package: libnx-xrender1-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Rendering Extension client library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted debug symbols for the libNX_Xrender.so.1 - library. With recent versions of NX, the system-wide installed libXrender - gets used. - . - This package can be safely removed. - -Package: libnx-xtst6 -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Description: nx-X11 Testing -- Record extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted libNX_Xtst.so.6 library. With - recent versions of NX, the system-wide installed libXtst gets used. - . - This package can be safely removed. - -Package: libnx-xtst-dev -Provides: libnx-xtst6-dev -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, -Description: nx-X11 Testing -- Record extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted headers for the libNX_Xtst.so.6 - library. With recent versions of NX, the system-wide installed libXtst - gets used. - . - This package can be safely removed. - -Package: libnx-xtst6-dbg -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - ${misc:Depends}, -Section: debug -Description: nx-X11 Testing -- Record extension library (dummy package) - NX is a software suite which implements very efficient - compression of the X11 protocol. This increases performance when - using X applications over a network, especially a slow one. - . - This package removes the obsoleted wire protocol headers for the - libNX_Xtst.so.6 library. With recent versions of NX, the system-wide - installed libXtst gets used. - . - This package can be safely removed. - Package: libnx-mesa-extras-dev Section: libdevel Architecture: any -- cgit v1.2.3 From 24ff7db2bf5ba74afbb268a57a70de9157c261d9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:08:35 +0200 Subject: debian/changelog: Suppress warnings from lintian about -0 revision in version string. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 802ba1b33..e97d3cb01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.99.0-0) UNRELEASED; urgency=medium +nx-libs (2:3.5.99.0-0.1) UNRELEASED; urgency=medium * Version bump, continuing NX 3.x development.. Targeting NX 3.6.x.y some time. -- cgit v1.2.3 From 2e1ec618110ed0685fbd54e4adc4689a708581c9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:08:49 +0200 Subject: debian/control: Use my DD address in Uploaders: field. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5fe9eceb8..b3bf1cb8a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: extra Maintainer: Artica Project Uploaders: - Mike Gabriel , + Mike Gabriel , Mihai Moldovan Build-Depends: debhelper (>= 7.0.50~), -- cgit v1.2.3 From 87ce9b4b059607dcaccc2c6b512bbf9fe39fc4ee Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:13:23 +0200 Subject: debian/{control,compat}: Bump to DH compat level 9. --- debian/compat | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011eb..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index b3bf1cb8a..2664f0428 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Mike Gabriel , Mihai Moldovan Build-Depends: - debhelper (>= 7.0.50~), + debhelper (>= 9), libpng-dev, libjpeg-dev, zlib1g-dev, -- cgit v1.2.3 From 9663b1ce2fd1ec307ec03dec5ff113166fe24f14 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:14:00 +0200 Subject: debian/control: Bump Standards: to 3.9.8. (Various changes were needed). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 2664f0428..310f6e1ee 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Build-Depends: expat, libpixman-1-dev (>= 0.13.2), xutils-dev, -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: https://github.com/ArcticaProject/nx-libs/ Vcs-Git: https://github.com/ArcticaProject/nx-libs/ Vcs-Browser: https://github.com/ArcticaProject/nx-libs/ -- cgit v1.2.3 From 2a2d7f0e2e3403ea0f8a5544bfc5a9c02ab3eeb8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 15:45:33 +0200 Subject: debian/control: Remove all Pre-Depends: fields from all bin:pkgs. --- debian/control | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/debian/control b/debian/control index 310f6e1ee..4c8ba15a0 100644 --- a/debian/control +++ b/debian/control @@ -68,8 +68,6 @@ Description: nx-X11 core wire protocol and auxiliary headers Package: libnx-x11-6 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -141,8 +139,6 @@ Description: nx-X11 client-side library (development headers) Package: libnx-x11-6-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libnx-x11-6 (= ${binary:Version}), ${misc:Depends}, @@ -178,8 +174,6 @@ Description: nx-X11 client-side library (debug package) Package: libnx-xau6 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -218,8 +212,6 @@ Description: nx-X11 authorisation library (development headers) Package: libnx-xau6-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libnx-xau6 (= ${binary:Version}), ${misc:Depends}, @@ -273,8 +265,6 @@ Description: nx-X11 Damage extension wire protocol (dummy package) Package: libnx-xext6 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -334,8 +324,6 @@ Description: nx-X11 miscellaneous extension wire protocol Package: libnx-xext6-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libnx-xext6 (= ${binary:Version}), ${misc:Depends}, @@ -553,8 +541,6 @@ Description: NX auth (debug package) Package: libxcomp3 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -590,8 +576,6 @@ Description: nx-X11 compression library (development headers) Package: libxcomp3-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libxcomp3 (= ${binary:Version}), ${misc:Depends}, @@ -609,8 +593,6 @@ Description: nx-X11 compression library (debug package) Package: libxcompext3 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -645,8 +627,6 @@ Description: nx-X11 protocol compression extensions library (development headers Package: libxcompext3-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libxcompext3 (= ${binary:Version}), ${misc:Depends}, @@ -664,8 +644,6 @@ Description: nx-X11 protocol compression extensions library (debug package) Package: libxcompshad3 Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -699,8 +677,6 @@ Description: nx-X11 shadowing library (development headers) Package: libxcompshad3-dbg Architecture: any Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, Depends: libxcompshad3 (= ${binary:Version}), ${misc:Depends}, -- cgit v1.2.3 From 56f776ced32538d5a33c637f20dfc9cb76a17f90 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:08:47 +0200 Subject: debian/control: Versioned B-D: dpkg-dev (>= 1.16.1.1). --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 4c8ba15a0..1a58cf6a7 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Uploaders: Mihai Moldovan Build-Depends: debhelper (>= 9), + dpkg-dev (>= 1.16.1.1), libpng-dev, libjpeg-dev, zlib1g-dev, -- cgit v1.2.3 From 7d66941aebf923a3311a07671e69160487c3f8f0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:09:19 +0200 Subject: debian/rules: Use buildflags.mk from dpkg-dev. Enable bindnow hardening flag. --- debian/rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index ec7616f7a..e41f97c81 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,9 @@ NULL = -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" -- cgit v1.2.3 From ba5f32cda184fcf1ff302327060b91317241f019 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:13:20 +0200 Subject: nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c: Fix typo (grammer -> grammar). ... detected by Debian's lintian tool. --- nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c index c998f7c66..7da4139d2 100644 --- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c +++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c @@ -97,8 +97,8 @@ * * Cosmetic Stuff * ----------------------------------------------------- - * - remove any leftover unused grammer.c stuff (dict_ ?) - * - fix grammer.c error handling so its not static + * - remove any leftover unused grammar.c stuff (dict_ ?) + * - fix grammar.c error handling so its not static * - #ifdef around stuff pertaining to extentions * * Outstanding Questions: @@ -3979,7 +3979,7 @@ _mesa_parse_arb_program (GLcontext * ctx, const GLubyte * str, GLsizei len, grammar_get_last_error ((GLubyte *) error_msg, 300, &error_pos); _mesa_set_program_error (ctx, error_pos, error_msg); _mesa_error (ctx, GL_INVALID_OPERATION, - "Error loading grammer rule set"); + "Error loading grammar rule set"); return GL_FALSE; } -- cgit v1.2.3 From 82a8d595ddfd324991793a19936cc8f1539a9ed7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:28:42 +0200 Subject: debian/libxcompext3.symbols: Add symbols file for libXcompext3. --- debian/libxcompext3.symbols | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 debian/libxcompext3.symbols diff --git a/debian/libxcompext3.symbols b/debian/libxcompext3.symbols new file mode 100644 index 000000000..0ca6ec6b8 --- /dev/null +++ b/debian/libxcompext3.symbols @@ -0,0 +1,103 @@ +libXcompext.so.3 libxcompext3 #MINVER# + AlphaCompressData@Base 3.5.0.29 + BitmapCompressData@Base 3.5.0.29 + CleanXYImage@Base 3.5.0.29 + CleanZImage@Base 3.5.0.29 + ColormapCompressData@Base 3.5.0.29 + CopyAndCleanImage@Base 3.5.0.29 + FindLSB@Base 3.5.0.29 + JpegCompressData@Base 3.5.0.29 + MaskImage@Base 3.5.0.29 + MaskInPlaceImage@Base 3.5.0.29 + NXAbortSplit@Base 3.5.0.29 + NXAllocColors@Base 3.5.0.29 + NXAllocSplit@Base 3.5.0.29 + NXAllocUnpack@Base 3.5.0.29 + NXCacheAddImage@Base 3.5.0.29 + NXCacheFindImage@Base 3.5.0.29 + NXCleanImage@Base 3.5.0.29 + NXCollectGrabPointer@Base 3.5.0.29 + NXCollectImage@Base 3.5.0.29 + NXCollectInputFocus@Base 3.5.0.29 + NXCollectProperty@Base 3.5.0.29 + NXCommitSplit@Base 3.5.0.29 + NXCreatePackedImage@Base 3.5.0.29 + NXCreatePalette16@Base 3.5.0.29 + NXCreatePalette32@Base 3.5.0.29 + NXDestroyPackedImage@Base 3.5.0.29 + NXDisplayCongestion@Base 3.5.0.29 + NXDisplayError@Base 3.5.0.29 + NXDisplayFlushable@Base 3.5.0.29 + NXDisplayReadable@Base 3.5.0.29 + NXEncodeAlpha@Base 3.5.0.29 + NXEncodeBitmap@Base 3.5.0.29 + NXEncodeColormap@Base 3.5.0.29 + NXEncodeColors@Base 3.5.0.29 + NXEncodeJpeg@Base 3.5.0.29 + NXEncodePng@Base 3.5.0.29 + NXEncodeRgb@Base 3.5.0.29 + NXEncodeRle@Base 3.5.0.29 + NXEndSplit@Base 3.5.0.29 + NXFinishSplit@Base 3.5.0.29 + NXFlushDisplay@Base 3.5.0.29 + NXForceDisplayError@Base 3.5.0.29 + NXFreeCache@Base 3.5.0.29 + NXFreeSplit@Base 3.5.0.29 + NXFreeUnpack@Base 3.5.0.29 + NXGetCollectGrabPointerResource@Base 3.5.0.29 + NXGetCollectImageResource@Base 3.5.0.29 + NXGetCollectInputFocusResource@Base 3.5.0.29 + NXGetCollectPropertyResource@Base 3.5.0.29 + NXGetCollectedGrabPointer@Base 3.5.0.29 + NXGetCollectedImage@Base 3.5.0.29 + NXGetCollectedInputFocus@Base 3.5.0.29 + NXGetCollectedProperty@Base 3.5.0.29 + NXGetControlParameters@Base 3.5.0.29 + NXGetFontParameters@Base 3.5.0.29 + NXGetShmemParameters@Base 3.5.0.29 + NXGetUnpackParameters@Base 3.5.0.29 + NXHandleDisplayError@Base 3.5.0.29 + NXImageCache@Base 3.5.0.29 + NXImageCacheHits@Base 3.5.0.29 + NXImageCacheOps@Base 3.5.0.29 + NXImageCacheSize@Base 3.5.0.29 + NXInPlacePackImage@Base 3.5.0.29 + NXInitCache@Base 3.5.0.29 + NXInitDisplay@Base 3.5.0.29 + NXMaskImage@Base 3.5.0.29 + NXPackImage@Base 3.5.0.29 + NXPutPackedImage@Base 3.5.0.29 + NXResetDisplay@Base 3.5.0.29 + NXSetCacheParameters@Base 3.5.0.29 + NXSetDisplayBlockHandler@Base 3.5.0.29 + NXSetDisplayBuffer@Base 3.5.0.29 + NXSetDisplayErrorPredicate@Base 3.5.0.29 + NXSetDisplayFlushHandler@Base 3.5.0.29 + NXSetDisplayPolicy@Base 3.5.0.29 + NXSetDisplayStatisticsHandler@Base 3.5.0.29 + NXSetDisplayWriteHandler@Base 3.5.0.29 + NXSetExposeParameters@Base 3.5.0.29 + NXSetLostSequenceHandler@Base 3.5.0.29 + NXSetUnpackAlpha@Base 3.5.0.29 + NXSetUnpackAlphaCompat@Base 3.5.0.29 + NXSetUnpackColormap@Base 3.5.0.29 + NXSetUnpackColormapCompat@Base 3.5.0.29 + NXSetUnpackGeometry@Base 3.5.0.29 + NXStartSplit@Base 3.5.0.29 + NXUnsetLibraryPath@Base 3.5.0.29 + PackImage@Base 3.5.0.29 + PngCompareColorTable@Base 3.5.0.29 + PngCompressData@Base 3.5.0.29 + RgbCompressData@Base 3.5.0.29 + RleCompressData@Base 3.5.0.29 + ZCompressData@Base 3.5.0.29 + ZInitEncoder@Base 3.5.0.29 + ZResetEncoder@Base 3.5.0.29 + _NXInternalInitEncoders@Base 3.5.0.29 + _NXInternalInitResources@Base 3.5.0.29 + _NXInternalResetEncoders@Base 3.5.0.29 + _NXInternalResetResources@Base 3.5.0.29 + color_type@Base 3.5.0.29 + info_ptr@Base 3.5.0.29 + palette@Base 3.5.0.29 + png_ptr@Base 3.5.0.29 -- cgit v1.2.3 From 2d016f826adbb816de012ac0c57e7efd226dbb3f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 23 Jun 2016 21:33:23 +0200 Subject: roll-tarball.sh: Move out of debian/ folder into project's base folder. --- debian/roll-tarballs.sh | 157 ------------------------------------------------ roll-tarballs.sh | 157 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 157 deletions(-) delete mode 100755 debian/roll-tarballs.sh create mode 100755 roll-tarballs.sh diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh deleted file mode 100755 index e735e8913..000000000 --- a/debian/roll-tarballs.sh +++ /dev/null @@ -1,157 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2011 by Mike Gabriel -# Copyright (C) 2012 by Reinhard Tartler -# -# This is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -# Thanks to Jonas Smedegaard for inspiration... - -# Formatting/cleanups by siretart in December 2012 - -set -e - -usage() { - echo "To be called at the project root of an nx-libs checkout" - echo "usage: $(basename "$0") {,HEAD} {server|client}" - exit 1 -} - -PROJECT="nx-libs" -NULL="" - -test -d ".git" || usage -RELEASE="$1" -test -n "${RELEASE}" || usage -CHECKOUT="$2" -test -n "$CHECKOUT" || usage - -if [ "x$CHECKOUT" = "xserver" ] || [ "x${CHECKOUT}" = "xfull" ]; then - MODE="full" - CHECKOUT="redist-server/${RELEASE}" - RELEASE_SUFFIX='-full' -elif [ "x$CHECKOUT" = "xclient" ] || [ "x${CHECKOUT}" = "xlite" ]; then - MODE="lite" - CHECKOUT="redist-client/${RELEASE}" - RELEASE_SUFFIX='-lite' -else - usage -fi - -if [ x"$RELEASE" == "xHEAD" ]; then - CHECKOUT="refs/heads/$(git rev-parse --abbrev-ref HEAD)" -fi - -if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then - echo " '${RELEASE}' is not a valid release number because there is no git tag named ${CHECKOUT}." - echo " Please specify one of the following releases:" - echo "HEAD (on branch `git rev-parse --abbrev-ref HEAD`)" - git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u - exit 1 -fi - -TARGETDIR=".." - -MANIFEST="$(mktemp)" -TEMP_DIR="$(mktemp -d)" - -trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 - -# create local copy of Git project at temp location -git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) -git --no-pager log --after "1972-01-01" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > "${TEMP_DIR}/${PROJECT}-${RELEASE}/ChangeLog" - -echo "Created tarball for $CHECKOUT" - -cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" - -# Replace symlinks by copies of the linked target files -# Note: We don't have symlinked directories!!! -find . -type "l" | while read link; do - TARGET="$(readlink "${link}")" - pushd "$(dirname "${link}")" >/dev/null - if [ -f "${TARGET}" ]; then - rm -f "$(basename "${link}")" - cp "${TARGET}" "$(basename "${link}")" - fi - popd >/dev/null -done - -mkdir -p "doc/applied-patches" - -# prepare patches for lite and full tarball -if [ "x$MODE" = "xfull" ]; then - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.(full|full\+lite)\.patch)" | while read file - do - cp -v "debian/patches/$file" "doc/applied-patches/" - echo "${file##*/}" >> "doc/applied-patches/series" - done -else - rm -f "bin/"{nxagent,nxauth} - rm -Rf "nxcompshad"* - rm -Rf "nxcompext"* - rm -Rf "nx-X11"* - rm -Rf "etc"* - rm -Rf "doc/nx-X11_vs_XOrg69_patches"* - rm -Rf "doc/X11-symbols"* - rm -f "README.keystrokes" - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file - do - cp -v "debian/patches/$file" "doc/applied-patches/" - echo "${file##*/}" >> "doc/applied-patches/series" - done -fi - -# apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball -if [ -s "doc/applied-patches/series" ]; then - QUILT_PATCHES="doc/applied-patches" quilt --quiltrc /dev/null push -a -q -else - echo "No patches applied at all. Very old release?" -fi - -# remove folders that we do not want to roll into the tarball -rm -Rf ".pc/" -rm -Rf "debian/" -rm -Rf "nx-libs.spec" - -# very old release did not add any README -for f in $(ls README* 2>/dev/null); do - mv -v "$f" "doc/"; -done - -# remove files, that we do not want in the tarballs (build cruft) -rm -Rf nx*/configure nx*/autom4te.cache* - -cd "$OLDPWD" - -# create target location for tarball -mkdir -p "${TARGETDIR}/_releases_/source/${PROJECT}/" - -# roll the ball... -cd "$TEMP_DIR" -find "${PROJECT}-${RELEASE}" -type f | sort > "$MANIFEST" -cd "$OLDPWD" - -tar c -C "$TEMP_DIR" \ - --owner 0 \ - --group 0 \ - --numeric-owner \ - --no-recursion \ - --files-from "$MANIFEST" \ - --gzip \ - > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" - -echo "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz is ready" diff --git a/roll-tarballs.sh b/roll-tarballs.sh new file mode 100755 index 000000000..60b5e916f --- /dev/null +++ b/roll-tarballs.sh @@ -0,0 +1,157 @@ +#!/bin/bash + +# Copyright (C) 2011-2016 by Mike Gabriel +# Copyright (C) 2012 by Reinhard Tartler +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +# Thanks to Jonas Smedegaard for inspiration... + +# Formatting/cleanups by siretart in December 2012 + +set -e + +usage() { + echo "To be called at the project root of an nx-libs checkout" + echo "usage: $(basename "$0") {,HEAD} {server|client}" + exit 1 +} + +PROJECT="nx-libs" +NULL="" + +test -d ".git" || usage +RELEASE="$1" +test -n "${RELEASE}" || usage +CHECKOUT="$2" +test -n "$CHECKOUT" || usage + +if [ "x$CHECKOUT" = "xserver" ] || [ "x${CHECKOUT}" = "xfull" ]; then + MODE="full" + CHECKOUT="redist-server/${RELEASE}" + RELEASE_SUFFIX='-full' +elif [ "x$CHECKOUT" = "xclient" ] || [ "x${CHECKOUT}" = "xlite" ]; then + MODE="lite" + CHECKOUT="redist-client/${RELEASE}" + RELEASE_SUFFIX='-lite' +else + usage +fi + +if [ x"$RELEASE" == "xHEAD" ]; then + CHECKOUT="refs/heads/$(git rev-parse --abbrev-ref HEAD)" +fi + +if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then + echo " '${RELEASE}' is not a valid release number because there is no git tag named ${CHECKOUT}." + echo " Please specify one of the following releases:" + echo "HEAD (on branch `git rev-parse --abbrev-ref HEAD`)" + git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u + exit 1 +fi + +TARGETDIR=".." + +MANIFEST="$(mktemp)" +TEMP_DIR="$(mktemp -d)" + +trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 + +# create local copy of Git project at temp location +git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) +git --no-pager log --after "1972-01-01" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > "${TEMP_DIR}/${PROJECT}-${RELEASE}/ChangeLog" + +echo "Created tarball for $CHECKOUT" + +cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" + +# Replace symlinks by copies of the linked target files +# Note: We don't have symlinked directories!!! +find . -type "l" | while read link; do + TARGET="$(readlink "${link}")" + pushd "$(dirname "${link}")" >/dev/null + if [ -f "${TARGET}" ]; then + rm -f "$(basename "${link}")" + cp "${TARGET}" "$(basename "${link}")" + fi + popd >/dev/null +done + +mkdir -p "doc/applied-patches" + +# prepare patches for lite and full tarball +if [ "x$MODE" = "xfull" ]; then + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.(full|full\+lite)\.patch)" | while read file + do + cp -v "debian/patches/$file" "doc/applied-patches/" + echo "${file##*/}" >> "doc/applied-patches/series" + done +else + rm -f "bin/"{nxagent,nxauth} + rm -Rf "nxcompshad"* + rm -Rf "nxcompext"* + rm -Rf "nx-X11"* + rm -Rf "etc"* + rm -Rf "doc/nx-X11_vs_XOrg69_patches"* + rm -Rf "doc/X11-symbols"* + rm -f "README.keystrokes" + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file + do + cp -v "debian/patches/$file" "doc/applied-patches/" + echo "${file##*/}" >> "doc/applied-patches/series" + done +fi + +# apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball +if [ -s "doc/applied-patches/series" ]; then + QUILT_PATCHES="doc/applied-patches" quilt --quiltrc /dev/null push -a -q +else + echo "No patches applied at all. Very old release?" +fi + +# remove folders that we do not want to roll into the tarball +rm -Rf ".pc/" +rm -Rf "debian/" +rm -Rf "nx-libs.spec" + +# very old release did not add any README +for f in $(ls README* 2>/dev/null); do + mv -v "$f" "doc/"; +done + +# remove files, that we do not want in the tarballs (build cruft) +rm -Rf nx*/configure nx*/autom4te.cache* + +cd "$OLDPWD" + +# create target location for tarball +mkdir -p "${TARGETDIR}/_releases_/source/${PROJECT}/" + +# roll the ball... +cd "$TEMP_DIR" +find "${PROJECT}-${RELEASE}" -type f | sort > "$MANIFEST" +cd "$OLDPWD" + +tar c -C "$TEMP_DIR" \ + --owner 0 \ + --group 0 \ + --numeric-owner \ + --no-recursion \ + --files-from "$MANIFEST" \ + --gzip \ + > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" + +echo "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz is ready" -- cgit v1.2.3 From 12ca29bf5418f0a7c4d7de57c5cd34c9151adac3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 1 Jul 2016 00:00:29 +0200 Subject: debian/*.dirs: Don't create directories in the Debian package. All handled well by the upstream Makefile. --- debian/nxagent.dirs | 3 --- debian/nxproxy.dirs | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 debian/nxagent.dirs delete mode 100644 debian/nxproxy.dirs diff --git a/debian/nxagent.dirs b/debian/nxagent.dirs deleted file mode 100644 index 544d2fa34..000000000 --- a/debian/nxagent.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/lib/nx/bin -usr/share/nx \ No newline at end of file diff --git a/debian/nxproxy.dirs b/debian/nxproxy.dirs deleted file mode 100644 index 7c8e1505c..000000000 --- a/debian/nxproxy.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/lib/nx/bin -- cgit v1.2.3