# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1456576834 -3600
# Node ID 54a12919cdee141391bb89461ec2d673f3000e21
# Parent  5a107c907e7134886cee5dfe67674fbacc73182e
Ready for release 1.0.2

diff -r 5a107c907e71 -r 54a12919cdee mcabber/ChangeLog
--- a/mcabber/ChangeLog	Sat Feb 27 11:28:24 2016 +0100
+++ b/mcabber/ChangeLog	Sat Feb 27 13:40:34 2016 +0100
@@ -1,8 +1,13 @@
-mcabber (1.0.2-dev)
+mcabber (1.0.2)
 
- * 
+ * Compatible with Loudmouth >=1.5.3 with SHA256 support (Frank Zschockelt)
+ * Ignore the untrusted certificate warning when user sets a fingerprint
+   (Frank Zschockelt)
+ * Stop HTML-escaping OTR messages - only strip known tags (Frank Zschockelt)
+ * Read $HOME/.mcabberrc if there is no mcabber configuration directory
+ * Minor documentation updates
 
- -- Mikael, ?
+ -- Mikael, 2016-02-27
 
 mcabber (1.0.1)
 
@@ -11,7 +16,8 @@
  * [PGP] Encrypt messages with our own PGP key and decrypt our own
    encrypted messages when Carbons are enabled
  * [PGP] New PGP options: 'gpg_path' and 'gpg_home' (Holger Weiß)
- * [PGP] Check all signatures and stop immediately if one could be verified (Sven Gaerner)
+ * [PGP] Check all signatures and stop immediately if one could be verified
+   (Sven Gaerner)
  * Improved Carbons support (Holger Weiß)
  * New option: 'clear_unread_on_carbon' (Holger Weiß)
  * Improve SSL fingerprint management;
@@ -59,7 +65,8 @@
    - "ssl_ca" to set additional trusted certificates
  * Fix compilation for old loudmouth libraries (Frank Zschockelt)
  * Add 'color_timestamp' to highlight timestamp added by server (Hermitifier)
- * New python based event script using OS X 10.8 notification center (Sharoon Thomas)
+ * New python based event script using OS X 10.8 notification center (Sharoon
+   Thomas)
  * Handle SIGHUP signal (Dominik George)
  * Misc. bugfixes
 
diff -r 5a107c907e71 -r 54a12919cdee mcabber/ChangeLog.api
--- a/mcabber/ChangeLog.api	Sat Feb 27 11:28:24 2016 +0100
+++ b/mcabber/ChangeLog.api	Sat Feb 27 13:40:34 2016 +0100
@@ -1,5 +1,6 @@
 dev (41)
 
+ * Stable api 1.0.2:1
  * Stable api 1.0.1:1
  * Change prototype of otr_send()
  * Changeset 0c78d31c753d
diff -r 5a107c907e71 -r 54a12919cdee mcabber/configure.ac
--- a/mcabber/configure.ac	Sat Feb 27 11:28:24 2016 +0100
+++ b/mcabber/configure.ac	Sat Feb 27 13:40:34 2016 +0100
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([mcabber],[1.0.2-dev],[mcabber@lilotux.net])
+AC_INIT([mcabber],[1.0.2],[mcabber@lilotux.net])
 XC_AUTOMAKE
 AC_CONFIG_SRCDIR([mcabber])
 AC_CONFIG_HEADERS([mcabber/config.h])
@@ -293,7 +293,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.0.2", [Mcabber branch])
 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
 
 # We need _GNU_SOURCE for strptime() and strcasestr()
diff -r 5a107c907e71 -r 54a12919cdee mcabber/doc/mcabber.1
--- a/mcabber/doc/mcabber.1	Sat Feb 27 11:28:24 2016 +0100
+++ b/mcabber/doc/mcabber.1	Sat Feb 27 13:40:34 2016 +0100
@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 03/19/2011
 .\"    Manual: \ \&
-.\"    Source: \ \& 1.0.2-dev
+.\"    Source: \ \& 1.0.2
 .\"  Language: English
 .\"
-.TH "MCABBER" "1" "03/19/2011" "\ \& 1\&.0\&.2\-dev\" "\ \&"
+.TH "MCABBER" "1" "02/27/2016" "\ \& 1\&.0\&.2\" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1418,7 +1418,7 @@
 \m[blue]\fBMCabber MUC room\fR\m[]\&\s-2\u[4]\d\s+2
 .SH "COPYING"
 .sp
-Copyright (C) 2005\-2014 Mikael Berthe and others\&.
+Copyright (C) 2005\-2016 Mikael Berthe and others\&.
 .sp
 Free use of this software is granted under the terms of the GNU General Public License (GPL)\&.
 .SH "NOTES"
diff -r 5a107c907e71 -r 54a12919cdee mcabber/doc/mcabber.1.html
--- a/mcabber/doc/mcabber.1.html	Sat Feb 27 11:28:24 2016 +0100
+++ b/mcabber/doc/mcabber.1.html	Sat Feb 27 13:40:34 2016 +0100
@@ -2608,7 +2608,7 @@
 </div>
 <h2 id="_copying">COPYING</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Copyright (C) 2005-2014 Mikael Berthe and others.<br /></p></div>
+<div class="paragraph"><p>Copyright (C) 2005-2016 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>
@@ -2616,7 +2616,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Version 1.0.2-dev<br />
+Version 1.0.2<br />
 Last updated 2011-03-19 13:18:41 CEST
 </div>
 </div>
diff -r 5a107c907e71 -r 54a12919cdee mcabber/doc/mcabber.1.txt
--- a/mcabber/doc/mcabber.1.txt	Sat Feb 27 11:28:24 2016 +0100
+++ b/mcabber/doc/mcabber.1.txt	Sat Feb 27 13:40:34 2016 +0100
@@ -1,7 +1,7 @@
 MCABBER(1)
 ===========
 Mikael BERTHE <mcabber@lilotux.net>
-v1.0.2-dev, January 2016
+v1.0.2, February 2016
 
 NAME
 ----
@@ -543,7 +543,7 @@
 
 COPYING
 -------
-Copyright \(C) 2005-2014 Mikael Berthe and others. +
+Copyright \(C) 2005-2016 Mikael Berthe and others. +
 
 Free use of this software is granted under the terms of the GNU General Public
 License (GPL).
diff -r 5a107c907e71 -r 54a12919cdee mcabber/mcabber/api.h
--- a/mcabber/mcabber/api.h	Sat Feb 27 11:28:24 2016 +0100
+++ b/mcabber/mcabber/api.h	Sat Feb 27 13:40:34 2016 +0100
@@ -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