# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1599413067 -7200
# Node ID b951567c78bf9ee2c1128720adcec29af1bb1c50
# Parent  87cc62145c7628ae6539c9cda00273127487bef1
Release 1.1.1

diff -r 87cc62145c76 -r b951567c78bf mcabber/ChangeLog
--- a/mcabber/ChangeLog	Sun Sep 06 17:33:54 2020 +0200
+++ b/mcabber/ChangeLog	Sun Sep 06 19:24:27 2020 +0200
@@ -1,8 +1,19 @@
-mcabber (1.1.1-dev)
+mcabber (1.1.1)
 
- * 
+ * Fix compilation with GCC 10 or -fno-common in CFLAGS (Andrey Utkin)
+ * Link against tinfo _or_ tinfow (Frank Zschockelt)
+ * Fix otr disconnected message for otrv4, remove support for libotr 3.x
+   (Frank Zschockelt)
+ * Fix exiting from verbatim multiline mode (Michał Kępień)
+ * Add support for displaying the number of unread messages for each roster
+   entry (Michał Kępień)
+ * Fix roster colors (Frank Zschockelt)
+ * Add colorcli theme (Jonas Jared Jacek)
+ * Hide the log window when log_win_height <= 0 (Frank Zschockelt)
+ * Refactor carbon message handling
+ * Other misc. bugfixes and cleanups
 
- -- Mikael, ?
+ -- Mikael, 2020-09-06
 
 mcabber (1.1.0)
 
diff -r 87cc62145c76 -r b951567c78bf mcabber/ChangeLog.api
--- a/mcabber/ChangeLog.api	Sun Sep 06 17:33:54 2020 +0200
+++ b/mcabber/ChangeLog.api	Sun Sep 06 19:24:27 2020 +0200
@@ -1,5 +1,6 @@
 dev (41)
 
+ * Stable api 1.1.1:1
  * Stable api 1.1.0:1
  * Stable api 1.0.5:1
  * Stable api 1.0.4:1
diff -r 87cc62145c76 -r b951567c78bf mcabber/configure.ac
--- a/mcabber/configure.ac	Sun Sep 06 17:33:54 2020 +0200
+++ b/mcabber/configure.ac	Sun Sep 06 19:24:27 2020 +0200
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([mcabber],[1.1.1-dev],[mcabber@lilotux.net])
+AC_INIT([mcabber],[1.1.1],[mcabber@lilotux.net])
 XC_AUTOMAKE
 AC_CONFIG_SRCDIR([mcabber])
 AC_CONFIG_HEADERS([mcabber/config.h])
@@ -292,7 +292,7 @@
 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
 
 # Prepare some config.h variables
-AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch])
+AC_DEFINE([MCABBER_BRANCH], "1.1.1", [Mcabber branch])
 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
 
 # We need _GNU_SOURCE for strptime() and strcasestr()
diff -r 87cc62145c76 -r b951567c78bf mcabber/doc/mcabber.1
--- a/mcabber/doc/mcabber.1	Sun Sep 06 17:33:54 2020 +0200
+++ b/mcabber/doc/mcabber.1	Sun Sep 06 19:24:27 2020 +0200
@@ -2,12 +2,12 @@
 .\"     Title: mcabber
 .\"    Author: Mikael BERTHE <mcabber@lilotux.net>
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: June 2017
+.\"      Date: September 2020
 .\"    Manual: \ \&
-.\"    Source: \ \& 1.1.1-dev
+.\"    Source: \ \& 1.1.1
 .\"  Language: English
 .\"
-.TH "MCABBER" "1" "May 2017" "\ \& 1\&.1\&.1\-dev" "\ \&"
+.TH "MCABBER" "1" "September 2020" "\ \& 1\&.1\&.1" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1528,7 +1528,7 @@
 \m[blue]\fBMCabber MUC room\fR\m[]\&\s-2\u[4]\d\s+2
 .SH "COPYING"
 .sp
-Copyright (C) 2005\-2017 Mikael Berthe and others\&.
+Copyright (C) 2005\-2020 Mikael Berthe and others\&.
 .sp
 Free use of this software is granted under the terms of the GNU General Public License (GPL)\&.
 .SH "AUTHOR"
diff -r 87cc62145c76 -r b951567c78bf mcabber/doc/mcabber.1.html
--- a/mcabber/doc/mcabber.1.html	Sun Sep 06 17:33:54 2020 +0200
+++ b/mcabber/doc/mcabber.1.html	Sun Sep 06 19:24:27 2020 +0200
@@ -2984,7 +2984,7 @@
 <div class="sect1">
 <h2 id="_copying">COPYING</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Copyright (C) 2005-2017 Mikael Berthe and others.<br></p></div>
+<div class="paragraph"><p>Copyright (C) 2005-2020 Mikael Berthe and others.<br></p></div>
 <div class="paragraph"><p>Free use of this software is granted under the terms of the GNU General Public
 License (GPL).</p></div>
 </div>
@@ -2993,9 +2993,9 @@
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
-Version 1.1.1-dev<br>
+Version 1.1.1<br>
 Last updated
- 2017-05-11 14:20:41 CEST
+ 2020-09-06 19:21:53 CEST
 </div>
 </div>
 </body>
diff -r 87cc62145c76 -r b951567c78bf mcabber/doc/mcabber.1.txt
--- a/mcabber/doc/mcabber.1.txt	Sun Sep 06 17:33:54 2020 +0200
+++ b/mcabber/doc/mcabber.1.txt	Sun Sep 06 19:24:27 2020 +0200
@@ -1,7 +1,7 @@
 MCABBER(1)
 ===========
 Mikael BERTHE <mcabber@lilotux.net>
-v1.1.1-dev, June 2017
+v1.1.1, September 2020
 
 NAME
 ----
@@ -589,7 +589,7 @@
 
 COPYING
 -------
-Copyright \(C) 2005-2017 Mikael Berthe and others. +
+Copyright \(C) 2005-2020 Mikael Berthe and others. +
 
 Free use of this software is granted under the terms of the GNU General Public
 License (GPL).
diff -r 87cc62145c76 -r b951567c78bf mcabber/mcabber/api.h
--- a/mcabber/mcabber/api.h	Sun Sep 06 17:33:54 2020 +0200
+++ b/mcabber/mcabber/api.h	Sun Sep 06 19:24:27 2020 +0200
@@ -4,10 +4,10 @@
 #include <glib.h>
 #include <mcabber/config.h> // For MCABBER_BRANCH
 
-#define MCABBER_API_VERSION 41
-#define MCABBER_API_MIN     41
+#define MCABBER_API_VERSION 1
+#define MCABBER_API_MIN     1
 
-#define MCABBER_BRANCH_DEV  1
+/* #define MCABBER_BRANCH_DEV  0 */
 
 // cmd_add returns gpointer id
 #define MCABBER_API_HAVE_CMD_ID 1