From e2b73ab90e9755d89dedf5c1c9a6dbfc962a5012 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 17 Apr 2019 11:04:51 +0200 Subject: release 3.5.99.20 --- ChangeLog | 68 +++++++++++++++++++++++- VERSION | 2 +- debian/changelog | 9 +++- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +- nx-libs.spec | 2 +- nxdialog/bin/nxdialog | 4 +- nxdialog/man/nxdialog.1 | 2 +- nxproxy/man/nxproxy.1 | 2 +- 8 files changed, 81 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 553df3bf6..c9b13b83b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,70 @@ -2019-03-01 16:48:17 +0100 Mike Gabriel (3339072a7) +2019-04-17 11:04:51 +0200 Mike Gabriel (f1f744a41) - * release 3.5.99.19 (HEAD -> 3.6.x, tag: 3.5.99.19) + * release 3.5.99.20 (HEAD -> 3.6.x, tag: 3.5.99.20) + +2019-04-17 10:52:00 +0200 Mike Gabriel (2a10438f7) + + * nxdialog/bin/nxdialog: Fix error dialog-type-not-supplied error + message. + +2019-04-08 11:50:08 +0200 Mihai Moldovan (f0aac0897) + + * Merge branch 'sunweaver-pr/pthread-flags' into arctica-3.6.x + +2019-03-01 23:16:49 +0100 Mike Gabriel (80ecfad95) + + * nxcomp/src/Makefile.am: Correct usage of PTHREAD_CFLAGS and + PTHREAD_LIBS. PTHREAD_CFLAGS is also supposed to be used + when linking. See comments in m4/ax_pthread.m4. + +2019-04-07 21:59:37 +0200 Mike Gabriel (1ff05c8e2) + + * nxdialog/Makefile.am: We forgot to clean up + nxdialog/bin/Makefile.in. + +2019-04-07 21:59:00 +0200 Mike Gabriel (34011ccad) + + * Makefile: Add clean/distclean target calls for nxdialog subdir to + master Makefile's clean/distclean targets. + +2019-04-07 21:36:05 +0200 Mike Gabriel (cb5c042a1) + + * Merge branch 'Ionic-bugfix/libXcomp-pthread-underlinking' into + 3.6.x + +2019-04-04 13:07:40 +0200 Mihai Moldovan (dd0d49c4e) + + * debian/patches/{,series}: remove 2004_enforce-lpthread.patch. + +2019-04-04 11:15:22 +0200 Mihai Moldovan (d1fe6a601) + + * nxproxy/{m4,configure.ac,src/Makefile.am}: drop pthread + overlinking. + +2019-04-04 11:06:05 +0200 Mihai Moldovan (95f8cf7ea) + + * m4/ax_pthread.m4: implement workaround for libtool bug #13550. + +2019-04-01 09:16:43 +0200 Mihai Moldovan (2efaa423b) + + * m4/: update external macros from autoconf-archive. + +2019-04-04 11:18:35 +0200 Mihai Moldovan (1b6da5992) + + * nxcomp/src/Makefile.am: PTHREAD_LDFLAGS does not exist, replace + with PTHREAD_LIBS. + +2019-03-25 06:42:08 +0100 Mihai Moldovan (3af59f806) + + * nxdialog/: create (almost) empty m4 directory. + +2019-03-01 18:59:22 +0100 Ulrich Sibiller (cf3ac71a3) + + * nxdialog: fix example + +2019-03-01 16:48:17 +0100 Mike Gabriel (59305c8b9) + + * release 3.5.99.19 (tag: 3.5.99.19) 2019-03-01 16:48:04 +0100 Mike Gabriel (da9a1bc0b) diff --git a/VERSION b/VERSION index df5f09d27..fa47e3d83 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.99.19 +3.5.99.20 diff --git a/debian/changelog b/debian/changelog index 751bbf833..139b83274 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -nx-libs (2:3.5.99.19-0) UNRELEASED; urgency=medium +nx-libs (2:3.5.99.20-0) unstable; urgency=medium + + * Upstream-provided Debian package for nx-libs. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Wed, 17 Apr 2019 11:03:42 +0200 + +nx-libs (2:3.5.99.19-0) unstable; urgency=medium * Upstream-provided Debian package for nx-libs. See upstream ChangeLog for recent changes. diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index c52c24f2a..6e67aa89b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .ds q \N'34' -.TH nxagent 1 "Mar 2019" "Version 3.5.99.19" "NX Agent (Xserver)" +.TH nxagent 1 "Apr 2019" "Version 3.5.99.20" "NX Agent (Xserver)" .SH NAME nxagent \- nested Xserver optimized for remote computing .SH SYNOPSIS diff --git a/nx-libs.spec b/nx-libs.spec index a59a443f4..c974cace3 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -10,7 +10,7 @@ %endif Name: nx-libs -Version: 3.5.99.19 +Version: 3.5.99.20 Release: 0.0build1%{?dist} Summary: NX X11 protocol compression libraries diff --git a/nxdialog/bin/nxdialog b/nxdialog/bin/nxdialog index c8355423d..7cd6467f4 100755 --- a/nxdialog/bin/nxdialog +++ b/nxdialog/bin/nxdialog @@ -298,7 +298,7 @@ class NxDialogProgram(object): parser = argparse.ArgumentParser(description="Helper for nxagent to display dialogs") - # nxagent 3.5.99.19 only uses yesno, ok, pulldown and yesnosuspend + # nxagent 3.5.99.20 only uses yesno, ok, pulldown and yesnosuspend # yesno dialogs will always kill the session if "yes" is selected parser.add_argument("--dialog", dest="dialog_type", help='type of dialog to show, one of "yesno", \ @@ -316,7 +316,7 @@ class NxDialogProgram(object): parser.add_argument("--window", dest="window", help="id of window where to embed the \ pulldown dialog type") - # -class, -local, -allowmultiple are unused in nxlibs 3.5.99.19 + # -class, -local, -allowmultiple are unused in nxlibs 3.5.99.20 parser.add_argument("--class", dest="dlgclass", default="info", help="class of the message (info, warning, error) \ default: info) [currently unimplemented]") diff --git a/nxdialog/man/nxdialog.1 b/nxdialog/man/nxdialog.1 index 6fe6d3f37..0bf9a71b8 100644 --- a/nxdialog/man/nxdialog.1 +++ b/nxdialog/man/nxdialog.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH nxdialog 1 "Mar 2019" "Version 3.5.99.19" "NX Dialog" +.TH nxdialog 1 "Apr 2019" "Version 3.5.99.20" "NX Dialog" .SH NAME nxdialog \- NX Dialog Helper .SH SYNOPSIS diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1 index 57df5b0cd..05a33c67a 100644 --- a/nxproxy/man/nxproxy.1 +++ b/nxproxy/man/nxproxy.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH nxproxy 1 "Mar 2019" "Version 3.5.99.19" "NX Proxy" +.TH nxproxy 1 "Apr 2019" "Version 3.5.99.20" "NX Proxy" .SH NAME nxproxy \- NX Proxy Tool .SH SYNOPSIS -- cgit v1.2.3