summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@openbsd.org>2020-12-05 17:22:47 +0100
committerGitHub <noreply@github.com>2020-12-05 17:22:47 +0100
commitf5a8dd4c58c49a9366de11b37a657dcfb4050310 (patch)
treed567c4665699b7147402c9be4c432844e96ce29b
parent3026d9a18e77fa09ab796385f02651b3ff7beaeb (diff)
parenta5666c473c1f467fa70343f407763b8ea15dd9ea (diff)
downloadConsoleKit2-f5a8dd4c58c49a9366de11b37a657dcfb4050310.tar.gz
Merge pull request #124 from rnagy/nrelease
prepare the 1.2.2 release and update AUTHORS
-rw-r--r--AUTHORS8
-rw-r--r--NEWS14
-rw-r--r--configure.ac2
-rw-r--r--po/ConsoleKit2.pot2
4 files changed, 22 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index 9e2dfe4..2572df7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,10 @@
-Current ConsoleKit2 Maintainer
+Current ConsoleKit2 Maintainers:
+--------------------------------
+Antoine Jacoutot <ajacoutot@openbsd.org>
+Robert Nagy <robert@openbsd.org>
Eric Koegel <eric.koegel@gmail.com>
-ConsoleKit Maintainer
+ConsoleKit Maintainer:
+----------------------
William Jon McCann <william.jon.mccann@gmail.com>
diff --git a/NEWS b/NEWS
index b999051..604ed06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,18 @@
==============
+Version 1.2.2
+==============
+Stable release of ConsoleKit2
+
+Changes since 1.2.1
+Bug Fixes:
+- Use the named pipe's random filepath as a lock reference
+- Fix signal handling with multiple inhibit events
+
+Misc Changes:
+- Merge enhancements from the OpenBSD port
+- Remove unused argument from the get_named_pipe_path() function
+
+==============
Version 1.2.1
==============
Stable release of ConsoleKit2
diff --git a/configure.ac b/configure.ac
index 97ffe85..4577854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_COPYRIGHT([Copyright 2014-2017 The ConsoleKit2 Team])
AC_PREREQ([2.62])
AC_INIT([ConsoleKit2],
- [1.2.1],
+ [1.2.2],
[https://github.com/ConsoleKit2/ConsoleKit2/issues],
[ConsoleKit2],
[https://github.com/ConsoleKit2/ConsoleKit2])
diff --git a/po/ConsoleKit2.pot b/po/ConsoleKit2.pot
index 5e0c20b..fc2b8c7 100644
--- a/po/ConsoleKit2.pot
+++ b/po/ConsoleKit2.pot
@@ -6,7 +6,7 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: ConsoleKit2 1.2.1\n"
+"Project-Id-Version: ConsoleKit2 1.2.2\n"
"Report-Msgid-Bugs-To: https://github.com/ConsoleKit2/ConsoleKit2/issues\n"
"POT-Creation-Date: 2017-12-13 15:40+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"