pidgin/old.pidgin.im

Merging

2017-02-12, Gary Kramlich
c0ed0bb4061b
Parents 5edbda93885abddb15fcb5fc
Children e61fd6472ab5
Merging
4 files changed, 25 insertions(+), 5 deletions(-)
  • +21 -0
    htdocs/ChangeLog
  • +0 -1
    htdocs/index.php
  • +2 -2
    inc/downloads.inc
  • +2 -2
    inc/version.inc
    • --- a/htdocs/ChangeLog Sun Feb 12 23:33:59 2017 -0600
    +++ b/htdocs/ChangeLog Sun Feb 12 23:34:33 2017 -0600
    @@ -1,5 +1,26 @@
    Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
    +version 2.10.12 (12/31/15):
    + General:
    + * purple-url-handler now works with Python 3.x (Daniël van Eeden)
    + * Fixed an issue where transient startup statuses could be deleted
    + (Jakub Adam) (#16762)
    +
    + Pidgin:
    + * The shout smile now matches the default theme (Steve Vaught)
    +
    + Windows-Specific Changes:
    + * Updates to dependencies:
    + * Cyrus SASL 2.1.26
    + * libxml2 2.9.2
    + * NSS 3.17.3 and NSPR 4.10.7
    + * Perl 5.20.1
    + * SILC 1.1.12
    + * Remove support for Tcl plugins
    +
    + Gadu-Gadu:
    + * Updated internal libgadu to version 1.12.1.
    +
    version 2.10.11 (11/23/14):
    General:
    * Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
    --- a/htdocs/index.php Sun Feb 12 23:33:59 2017 -0600
    +++ b/htdocs/index.php Sun Feb 12 23:34:33 2017 -0600
    @@ -114,7 +114,6 @@
    <p class="more" id="lowblurb">
    <!-- Put little news blurbs here! -->
    -Pidgin 2.10.11 contains login fixes for MSN and some XMPP servers, and Pidgin 2.10.10 contains <a href="/news/security/">important security updates</a>. Please upgrade!
    </p>
    </div>
    --- a/inc/downloads.inc Sun Feb 12 23:33:59 2017 -0600
    +++ b/inc/downloads.inc Sun Feb 12 23:34:33 2017 -0600
    @@ -44,8 +44,8 @@
    'subsect' => 'Mac OS X',
    'description' => 'Download the free Pidgin universal chat client for Mac OS X',
    'body' => '<p>For a native Mac OS X experience we recommend <a href="http://adium.im" onClick="javascript:pageTracker._trackPageview("/external/adium.im");">Adium</a>, which uses libpurple (the core of Pidgin) for much of its protocol support.</p>
    -<p>If you\'re sure you want to use Pidgin on OS X, you may find the packages provided through <a href="http://finkproject.org/download/" onClick="javascript:pageTracker._trackPageview("/external/finkproject.org");">Fink</a> or <a href="http://www.macports.org/install.php" onClick="javascript:pageTracker._trackPageview("/external/macports.org");">Macports</a> more convenient than compiling from source. Please note, <i>we do not provide support for issues related to installing Fink, Macports, or their packages of Pidgin</i>. Contact those projects directly with questions or concerns.</p>
    -<p>If you\'re sure you want to use Pidgin on OS X and you don\'t want to use Fink or Macports, you can <a href="/download/source/">download the Pidgin source</a> and compile.</p>',
    +<p>If you\'re sure you want to use Pidgin on OS X, you may find the packages provided through <a href="http://brew.sh/" onClick="javascript:pageTracker._trackPageview("/external/brew.sh");">Homebrew</a>, <a href="http://finkproject.org/download/" onClick="javascript:pageTracker._trackPageview("/external/finkproject.org");">Fink</a> or <a href="https://www.macports.org/install.php" onClick="javascript:pageTracker._trackPageview("/external/macports.org");">Macports</a> more convenient than compiling from source. Please note, <i>we do not provide support for issues related to installing Homebrew, Fink, Macports, or their packages of Pidgin</i>. Contact those projects directly with questions or concerns.</p>
    +<p>If you\'re sure you want to use Pidgin on OS X and you don\'t want to use Homebrew, Fink or Macports, you can <a href="/download/source/">download the Pidgin source</a> and compile.</p>',
    ),
    'source' => array(
    --- a/inc/version.inc Sun Feb 12 23:33:59 2017 -0600
    +++ b/inc/version.inc Sun Feb 12 23:34:33 2017 -0600
    @@ -1,7 +1,7 @@
    <?php
    // Current Pidgin Release
    -$pidgin_version = "2.10.11";
    +$pidgin_version = "2.10.12";
    // Current Windows Pidgin Release
    -$pidgin_win32_version = "2.10.11";
    +$pidgin_win32_version = "2.10.12";