/pidgin/main: 6be0c13ff4fa: Merge
Tomasz Wasilczyk
twasilczyk at pidgin.im
Mon Feb 3 05:26:15 EST 2014
Changeset: 6be0c13ff4fa0ae24f9df9875ff696289fef3c18
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-02-03 11:25 +0100
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/6be0c13ff4fa
Description:
Merge
diffstat:
.hgignore | 1 -
.hgtags | 1 +
ChangeLog | 2 +-
Makefile.am | 5 +-
configure.ac | 1 -
pidgin.spec.in | 671 --------
po/ChangeLog | 6 +-
po/POTFILES.in | 3 -
po/af.po | 907 ++++++----
po/am.po | 723 +++++----
po/ar.po | 897 ++++++----
po/as.po | 1063 ++++++++-----
po/ast.po | 104 +-
po/az.po | 717 +++++---
po/be at latin.po | 905 ++++++----
po/bg.po | 839 ++++++----
po/bn.po | 914 +++++++----
po/bn_IN.po | 891 ++++++----
po/bs.po | 863 ++++++----
po/ca.po | 897 ++++++----
po/ca at valencia.po | 873 ++++++----
po/cs.po | 895 ++++++----
po/da.po | 119 +-
po/dz.po | 918 ++++++----
po/el.po | 126 +-
po/en_AU.po | 864 ++++++----
po/en_CA.po | 674 ++++---
po/en_GB.po | 2079 ++++++--------------------
po/eo.po | 831 ++++++----
po/es.po | 4099 +++++++++++++++++++++++++++-------------------------
po/et.po | 104 +-
po/eu.po | 901 ++++++----
po/fa.po | 104 +-
po/fi.po | 894 ++++++----
po/fr.po | 907 +++++++----
po/ga.po | 104 +-
po/gl.po | 886 ++++++----
po/gu.po | 862 ++++++----
po/he.po | 104 +-
po/hi.po | 887 ++++++----
po/hr.po | 685 ++++---
po/hu.po | 885 ++++++----
po/hy.po | 654 ++++---
po/id.po | 905 ++++++----
po/it.po | 909 +++++++----
po/ja.po | 883 ++++++----
po/ka.po | 755 +++++----
po/km.po | 2433 ++++++++----------------------
po/kn.po | 873 ++++++----
po/ko.po | 891 ++++++----
po/ku.po | 821 ++++++----
po/lo.po | 628 ++++---
po/lt.po | 104 +-
po/mai.po | 843 ++++++----
po/mhr.po | 843 ++++++----
po/mk.po | 918 +++++++----
po/ml.po | 893 ++++++----
po/mn.po | 839 ++++++----
po/mr.po | 865 ++++++----
po/ms_MY.po | 674 ++++---
po/my_MM.po | 104 +-
po/nb.po | 863 ++++++----
po/ne.po | 862 ++++++----
po/nl.po | 116 +-
po/nn.po | 104 +-
po/oc.po | 702 ++++----
po/or.po | 832 ++++++----
po/pa.po | 104 +-
po/pl.po | 123 +-
po/ps.po | 751 +++++----
po/pt.po | 113 +-
po/pt_BR.po | 964 +++++++-----
po/ro.po | 912 +++++++----
po/ru.po | 119 +-
po/si.po | 721 +++++----
po/sk.po | 885 ++++++----
po/sl.po | 104 +-
po/sq.po | 104 +-
po/sr.po | 847 ++++++----
po/sr at latin.po | 871 ++++++----
po/sv.po | 821 ++++++----
po/sw.po | 751 +++++----
po/ta.po | 892 ++++++----
po/te.po | 824 ++++++----
po/th.po | 731 +++++----
po/tr.po | 894 ++++++----
po/uk.po | 905 +++++++----
po/ur.po | 905 ++++++----
po/vi.po | 900 ++++++----
po/xh.po | 864 ++++++----
po/zh_CN.po | 859 ++++++----
po/zh_HK.po | 815 ++++++----
po/zh_TW.po | 815 ++++++----
93 files changed, 36735 insertions(+), 29384 deletions(-)
diffs (truncated from 93579 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -93,7 +93,6 @@ pidgin-.*.tar.gz
pidgin.apspec$
pidgin.desktop$
pidgin.desktop.in$
-pidgin.spec$
pidgin/.*\.html\.h$
pidgin/pidgin$
pidgin/pixmaps/emotes/default/24/theme
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -88,3 +88,4 @@ a3d157700972b48cf0a23b300261a5ab0c6e165b
4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7
5010e6877abce3bfc2a4912e6b38fed7d6d3df19 v2.10.8
+9438f4b2904d9574b9e6ffba463d354b3661139f v2.10.9
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,7 +61,7 @@ version 3.0.0 (??/??/????):
* Various core components of libpurple are now GObjects.
* Ciphers are now built from the libpurple directory.
-version 2.10.9:
+version 2.10.9 (2/2/2014):
XMPP:
* Fix problems logging into some servers including jabber.org and
chat.facebook.com. (#15879)
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,15 +16,13 @@ EXTRA_DIST = \
intltool-update.in \
package_revision.h \
pidgin.apspec.in \
- pidgin.spec.in \
pidgin.desktop.in \
po/Makefile.mingw \
valgrind-suppressions
noinst_HEADERS = config.h package_revision.h
-dist-hook: pidgin.spec
- cp pidgin.spec $(distdir)
+dist-hook:
rm $(distdir)/config.h
distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/Pidgin.pm
@@ -47,7 +45,6 @@ version-check:
# Ensure ChangeLogs have the correct version
head ChangeLog | grep "^version $(PACKAGE_VERSION) (.*):$$" >/dev/null
head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null
- head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
# Ensure we're working from a tag...
test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug`
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2993,7 +2993,6 @@ AC_CONFIG_FILES([Makefile
finch/plugins/Makefile
po/Makefile.in
pidgin.desktop.in
- pidgin.spec
])
AC_OUTPUT
diff --git a/pidgin.spec.in b/pidgin.spec.in
deleted file mode 100644
--- a/pidgin.spec.in
+++ /dev/null
@@ -1,671 +0,0 @@
-# Older RPM doesn't define these by default
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-%{!?perl_archlib: %define perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib)}
-
-# When not doing betas comment this out
-# NOTE: %defines in spec files are evaluated in comments so the correct
-# way to comment it out is to replace the % with #
-#define beta 7
-
-%if 0%{?beta}
-%define pidginver %(echo "@VERSION@"|sed -e 's/dev.*//; s/beta.*//')
-%else
-%define pidginver @VERSION@
-%endif
-
-# define the minimum API version required, so we can use it for plugin deps
-%define apiver %(echo "@VERSION@"|awk -F. '{print $1"."$2}')
-
-Summary: A GTK+ based multiprotocol instant messaging client
-Name: @PACKAGE@
-Version: %pidginver
-Release: 0%{?beta:.beta%{beta}}
-License: GPL
-Group: Applications/Internet
-URL: https://pidgin.im/
-Source: %{name}- at VERSION@.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-# Generic build requirements
-BuildRequires: libtool, pkgconfig, intltool, gettext, libxml2-devel
-BuildRequires: gtk2-devel, libidn-devel
-
-%{!?_without_startupnotification:BuildRequires: startup-notification-devel}
-%{?_with_avahi:BuildRequires: avahi-glib-devel}
-%{!?_without_gtkspell:BuildRequires: gtkspell-devel}
-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
-%{?_with_mono:BuildRequires: mono-devel}
-%{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
-%{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
-%{!?_without_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
-%{!?_without_text:BuildRequires: ncurses-devel}
-%{!?_without_nm:BuildRequires: NetworkManager-devel}
-%{!?_without_gevolution:BuildRequires: evolution-data-server-devel}
-
-%if "%{_vendor}" == "suse"
-# For SuSE:
-BuildRequires: gnutls-devel
-%define sslopts --enable-gnutls=yes --enable-nss=no
-%{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
-%{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
-Requires(pre): gconf2
-Requires(post): gconf2
-Requires(preun): gconf2
-%else
-%define sslopts --enable-gnutls=no --enable-nss=yes
-%{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
-%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-%endif
-
-# Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
-%if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
-# For Mandrake/Mandriva:
-BuildRequires: libnss3-devel, perl-devel
-Obsoletes: libgaim-remote0
-%{!?_without_modularx:BuildRequires: libsm-devel, libxscrnsaver-devel}
-%else
-# For !Mandriva
-%{!?_without_modularx:BuildRequires: libSM-devel, libXScrnSaver-devel}
-# For SuSE, Red Hat, Fedora and others:
-%if "%{_vendor}" != "suse"
-# For Red Hat, Fedora and others:
-# let's assume RH & FC1 are the only brain-dead distros missing the
-# perl-XML-Parser dependency on intltool and that other RH/FC releases
-# don't care if we specify it here
-BuildRequires: perl-XML-Parser
-BuildRequires: mozilla-nss-devel
-%endif
-%endif
-
-# For some reason perl isn't always automatically detected as a requirement :(
-Requires: perl
-
-Requires: libpurple = %{version}
-
-Obsoletes: gaim
-Provides: gaim
-Obsoletes: pidgin-perl < %{version}
-Provides: pidgin-perl = %{version}-%{release}
-
-%package devel
-Summary: Development headers, documentation, and libraries for Pidgin
-Group: Applications/Internet
-Requires: pidgin = %{version}, libpurple-devel = %{version}
-Requires: gtk2-devel
-Requires: pkgconfig
-Obsoletes: gaim-devel
-Provides: gaim-devel
-
-%package -n libpurple
-Summary: libpurple library for IM clients like Pidgin and Finch
-Group: Applications/Internet
-Obsoletes: gaim-silc
-Obsoletes: gaim-tcl
-Obsoletes: gaim-gadugadu
-Obsoletes: pidgin-tcl < 2.0.0
-Obsoletes: pidgin-silc < 2.0.0
-Obsoletes: libpurple-perl < %{version}
-Provides: libpurple-perl = %{version}-%{release}
-%{?_with_sasl:Requires: cyrus-sasl-plain, cyrus-sasl-md5}
-
-%package -n libpurple-devel
-Summary: Development headers, documentation, and libraries for libpurple
-Group: Applications/Internet
-Requires: libpurple = %{version}
-Requires: pkgconfig
-%if "%{_vendor}" == "suse"
-# For SuSE:
-%{?_with_dbus:Requires: dbus-1-devel >= 0.35}
-%else
-%{?_with_dbus:Requires: dbus-devel >= 0.35}
-%endif
-
-%if 0%{?_with_avahi:1}
-%package -n libpurple-bonjour
-Summary: Bonjour plugin for Pidgin
-Group: Applications/Internet
-Requires: libpurple >= %{apiver}
-%endif
-
-%if 0%{?_with_meanwhile:1}
-%package -n libpurple-meanwhile
-Summary: Lotus Sametime plugin for Pidgin using the Meanwhile library
-Group: Applications/Internet
-Requires: libpurple >= %{apiver}
-%endif
-
-%if 0%{?_with_mono:1}
-%package -n libpurple-mono
-Summary: Mono .NET plugin support for Pidgin
-Group: Applications/Internet
-Requires: libpurple >= %{apiver}
-%endif
-
-%if 0%{!?_without_text:1}
-%package -n finch
-Summary: A text-based user interface for Pidgin
-Group: Applications/Internet
-Requires: libpurple = %{version}
-
-%package -n finch-devel
-Summary: Headers etc. for finch stuffs
-Group: Applications/Internet
-Requires: finch = %{version}, libpurple-devel = %{version}
-Requires: ncurses-devel
-Requires: pkgconfig
-%endif
-
-%description
-Pidgin allows you to talk to anyone using a variety of messaging
-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
-Zephyr. These protocols are implemented using a modular, easy to
-use design. To use a protocol, just add an account using the
-account editor.
-
-Pidgin supports many common features of other clients, as well as many
-unique features, such as perl scripting, TCL scripting and C plugins.
-
-Pidgin is not affiliated with or endorsed by America Online, Inc.,
-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
-
-%description devel
-The pidgin-devel package contains the header files, developer
-documentation, and libraries required for development of Pidgin scripts
-and plugins.
-
-%description -n libpurple
-libpurple contains the core IM support for IM clients such as Pidgin
-and Finch.
-
-libpurple supports a variety of messaging protocols including AIM, MSN,
-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
-Lotus Sametime, SILC, Simple and Zephyr.
-
-%description -n libpurple-devel
-The libpurple-devel package contains the header files, developer
-documentation, and libraries required for development of libpurple based
-instant messaging clients or plugins for any libpurple based client.
-
-%if 0%{?_with_avahi:1}
-%description -n libpurple-bonjour
-Bonjour plugin for Pidgin.
-%endif
-
-%if 0%{?_with_meanwhile:1}
-%description -n libpurple-meanwhile
-Lotus Sametime plugin for Pidgin using the Meanwhile library.
-%endif
-
-%if 0%{?_with_mono:1}
-%description -n libpurple-mono
-Mono plugin loader for Pidgin. This package will allow you to write or
-use Pidgin plugins written in the .NET programming language.
-%endif
-
-%if 0%{!?_without_text:1}
-%description -n finch
-A text-based user interface for using libpurple. This can be run from a
-standard text console or from a terminal within X Windows. It
-uses ncurses and our homegrown gnt library for drawing windows
-and text.
-
-%description -n finch-devel
-The finch-devel package contains the header files, developer
-documentation, and libraries required for development of Finch scripts
-and plugins.
-%endif
-
-%prep
-%setup -q -n %{name}- at VERSION@
-
More information about the Commits
mailing list