Mercurial > pidgin3 / changeset

--- a/ChangeLog	Tue Mar 30 03:22:10 2021 -0500
+++ b/ChangeLog	Thu Apr 01 14:05:43 2021 -0500
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.14.2 (??/??/????):
+version 2.14.2 (04/01/2021):
 	* Fix a build issue when compiling with gstreamer but without voice and
 	  video. (RR #25)
 	* Enable cyrus-sasl by default. (RR #26)
@@ -8,6 +8,8 @@
 	* Fix a regression from 2.14.0 where extra whitespace would be displayed
 	  when pasting <p> elements from HTML. (RR #504) (PIDGIN-17437)
 	* Require Python 3 for generating the D-Bus bindings. (RR #550)
+	* Fix an issue where pasting <hr>'s and other HTML elements would
+	  eventually lead to a crash. (RR #514) (PIDGIN-17446)
 
 version 2.14.1 (11/06/2020):
 	* Fixed issues with Windows installer that always thought Pidgin was

--- a/Makefile.am	Tue Mar 30 03:22:10 2021 -0500
+++ b/Makefile.am	Thu Apr 01 14:05:43 2021 -0500
@@ -141,3 +141,8 @@
 
 DISTCLEANFILES= intltool-extract intltool-merge intltool-update \
 			package_revision_raw.txt
+
+# This file isn't cleaned up due to an upstream intltool bug
+# https://bugs.launchpad.net/intltool/+bug/1712194
+DISTCLEANFILES += po/.intltool-merge-cache.lock
+

--- a/configure.ac	Tue Mar 30 03:22:10 2021 -0500
+++ b/configure.ac	Thu Apr 01 14:05:43 2021 -0500
@@ -25,7 +25,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [14])
 m4_define([purple_micro_version], [2])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))