From 8cbea6f276818c2f1d6a6a14ea2c4c3fffc9c67c Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Thu, 27 Aug 2015 16:15:58 +0300 Subject: [PATCH] update files in preparation for next release --- ChangeLog | 2 +- NEWS | 9 ++++++--- VERSION | 2 +- contrib/debian/changelog | 11 +++++++++++ contrib/opensuse-build-service/PKGBUILD | 2 +- contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc | 2 +- contrib/opensuse-build-service/pidgin-sipe.changes | 5 +++++ contrib/opensuse-build-service/pidgin-sipe.spec | 5 ++++- contrib/rpm/pidgin-sipe.spec | 5 ++++- siplcs.vcxproj | 4 ++-- src/adium/xcconfigs/Base.xcconfig | 2 +- 11 files changed, 37 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30b8f75e..f504507e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -version 1.20.0 "???" (2015-XX-XX) +version 1.20.0 "SRTP, Conference URL & TLS-DSK Improvements" (2015-XX-XX) - Feature #82: Parse HTML from Lync conference URL (Stefan Becker) - Feature #69: SRTP Support (Jakub Adam) * requires libpurple >= 3.0.0 diff --git a/NEWS b/NEWS index 3e5fa9a9..2896c5a9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ -version 1.19.1 "Bug Fixes I" (2015-04-04) - - Fixed #278: 488 error after libnice upgrade (Jakub Adam) - - fix SIP re-authentication timeout to be max. 8 hours (Stefan Becker) +version 1.20.0 "SRTP, Conference URL & TLS-DSK Improvements" (2015-XX-XX) + - Feature #82: Parse HTML from Lync conference URL (Stefan Becker) + - Feature #69: SRTP Support (Jakub Adam) + * requires libpurple >= 3.0.0 + - Fixed #285: Office365 rejects RC4 in TLS-DSK (Stefan Becker) + * added support for AES-128/256-CBC diff --git a/VERSION b/VERSION index 66e2ae6c..39893559 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.1 +1.20.0 diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 0431d4fb..f6975170 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,14 @@ +pidgin-sipe (1.20.0-1) unstable; urgency=low + + * New upstreamv ersion 1.20.0 "SRTP, Conference URL & TLS-DSK Improvements" (2015-XX-XX) + - Feature #82: Parse HTML from Lync conference URL (Stefan Becker) + - Feature #69: SRTP Support (Jakub Adam) + * requires libpurple >= 3.0.0 + - Fixed #285: Office365 rejects RC4 in TLS-DSK (Stefan Becker) + * added support for AES-128/256-CBC + + -- Stefan Becker Thu, 27 Aug 2015 16:08:00 +0300 + pidgin-sipe (1.19.1-1) unstable; urgency=low * New upstream version 1.19.1 "Bug Fixes I" (2015-04-04) diff --git a/contrib/opensuse-build-service/PKGBUILD b/contrib/opensuse-build-service/PKGBUILD index 836a8a27..71a9ecfb 100644 --- a/contrib/opensuse-build-service/PKGBUILD +++ b/contrib/opensuse-build-service/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: SIPE Project pkgname=pidgin-sipe -pkgver=1.19.1 +pkgver=1.20.0 pkgrel=1 pkgdesc="Libpurple protocol plugin to connect to MS Office Communicator" arch=(i686 x86_64) diff --git a/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc b/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc index 03dab065..27cea790 100644 --- a/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc +++ b/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc @@ -1,6 +1,6 @@ Format: 3.0 (quilt) Source: pidgin-sipe -Version: 1.19.1-1 +Version: 1.20.0-1 Binary: pidgin-sipe Maintainer: pidgin-sipe Architecture: any diff --git a/contrib/opensuse-build-service/pidgin-sipe.changes b/contrib/opensuse-build-service/pidgin-sipe.changes index 174f34c3..afcbde52 100644 --- a/contrib/opensuse-build-service/pidgin-sipe.changes +++ b/contrib/opensuse-build-service/pidgin-sipe.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Aug 27 13:09:00 UTC 2015 - chemobejk@gmail.com + +- Update to version 1.20.0: + +------------------------------------------------------------------- Tue Jun 30 15:14:25 UTC 2015 - dimstar@opensuse.org - Port to GStreamer 1.0 (follow pidin's port): diff --git a/contrib/opensuse-build-service/pidgin-sipe.spec b/contrib/opensuse-build-service/pidgin-sipe.spec index 210d5b36..09f1c395 100644 --- a/contrib/opensuse-build-service/pidgin-sipe.spec +++ b/contrib/opensuse-build-service/pidgin-sipe.spec @@ -133,7 +133,7 @@ Name: pidgin-sipe %endif %endif Summary: Pidgin protocol plugin to connect to MS Office Communicator -Version: 1.19.1 +Version: 1.20.0 Release: 1 Source: pidgin-sipe-%{version}.tar.gz Group: %{pkg_group} @@ -535,6 +535,9 @@ rm -rf %{buildroot} %changelog +* DDD MMM DD 2015 J. D. User 1.20.0 +- update to 1.20.0 + * Sat Apr 04 2015 J. D. User 1.19.1 - update to 1.19.1 diff --git a/contrib/rpm/pidgin-sipe.spec b/contrib/rpm/pidgin-sipe.spec index 2fa6802a..d517c83a 100644 --- a/contrib/rpm/pidgin-sipe.spec +++ b/contrib/rpm/pidgin-sipe.spec @@ -25,7 +25,7 @@ Name: pidgin-sipe Summary: Pidgin protocol plugin to connect to MS Office Communicator -Version: 1.19.1 +Version: 1.20.0 %if 0%{?_with_git:1} Release: %{gitcount}.%{git}%{?dist} Source: %{name}-%{git}.tar.bz2 @@ -288,6 +288,9 @@ rm -rf %{buildroot} %changelog +* DDD MMM DD 2015 J. D. User 1.20.0 +- update to 1.20.0 + * Sat Apr 04 2015 J. D. User 1.19.1 - update to 1.19.1 diff --git a/siplcs.vcxproj b/siplcs.vcxproj index c0064632..d323db2a 100755 --- a/siplcs.vcxproj +++ b/siplcs.vcxproj @@ -106,7 +106,7 @@ Full $(SolutionDir)/../include;$(ProjectDir)/src/api;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.19.1";PACKAGE_URL="http://sipe.sourceforge.net/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.19.1";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;HAVE_SSPI;SECURITY_WIN32;SIPE_TRANSLATIONS_URL="https://www.transifex.com/stefanb/pidgin-sipe/";%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.20.0";PACKAGE_URL="http://sipe.sourceforge.net/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.20.0";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;HAVE_SSPI;SECURITY_WIN32;SIPE_TRANSLATIONS_URL="https://www.transifex.com/stefanb/pidgin-sipe/";%(PreprocessorDefinitions) MultiThreadedDLL Level3 ProgramDatabase @@ -122,7 +122,7 @@ Disabled $(SolutionDir)/../include;$(ProjectDir)/src/core;$(ProjectDir)/src/api;$(ProjectDir)/src/;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.19.1";PACKAGE_URL="http://sipe.sourceforge.net/";SIPE_TRANSLATIONS_URL="https://www.transifex.com/stefanb/pidgin-sipe/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.19.1";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;SECURITY_WIN32;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;PACKAGE_NAME="pidgin-sipe";PACKAGE_VERSION="1.20.0";PACKAGE_URL="http://sipe.sourceforge.net/";SIPE_TRANSLATIONS_URL="https://www.transifex.com/stefanb/pidgin-sipe/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.20.0";_CRT_SECURE_NO_WARNINGS;HAVE_NSS;HAVE_GMIME;HAVE_VV;ENABLE_NLS;MIRANDA;HAVE_GSSAPI_GSSAPI_H;SECURITY_WIN32;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDLL diff --git a/src/adium/xcconfigs/Base.xcconfig b/src/adium/xcconfigs/Base.xcconfig index f8b82594..3ffd115c 100644 --- a/src/adium/xcconfigs/Base.xcconfig +++ b/src/adium/xcconfigs/Base.xcconfig @@ -21,7 +21,7 @@ PACKAGE_BUGREPORT=\"https:${SLASH}/sourceforge.net/p/sipe/bugs/\" PACKAGE_URL=\"http:${SLASH}/sipe.sourceforge.net/\" // No need to change version number in the xcodeproj file every release, just here. -PACKAGE_VERSION=1.19.1 +PACKAGE_VERSION=1.20.0 PACKAGE_STRING=\"pidgin-sipe\ ${PACKAGE_VERSION}\" GCC_PREPROCESSOR_DEFINITIONS = SIPE_TRANSLATIONS_URL=${SIPE_TRANSLATIONS_URL} LOCALEDIR=\"translations\" PURPLE_STATIC_PRPL=1 HAVE_BIND_TEXTDOMAIN_CODESET=1 ENABLE_NLS=1 ADIUM=1 PACKAGE_NAME=\"pidgin-sipe\" PACKAGE_TARNAME=\"pidgin-sipe\" PACKAGE_BUGREPORT=${PACKAGE_BUGREPORT} PACKAGE_VERSION=\"${PACKAGE_VERSION}\" PACKAGE_STRING=${PACKAGE_STRING} PACKAGE_URL=${PACKAGE_URL} STDC_HEADERS=1 HAVE_SYS_TYPES_H=1 HAVE_SYS_STAT_H=1 HAVE_STDLIB_H=1 HAVE_STRING_H=1 HAVE_MEMORY_H=1 HAVE_STRINGS_H=1 HAVE_INTTYPES_H=1 HAVE_STDINT_H=1 HAVE_UNISTD_H=1 HAVE_DLFCN_H=1 LT_OBJDIR=\".libs/\" STDC_HEADERS=1 HAVE_LOCALE_H=1 HAVE_LC_MESSAGES=1 HAVE_DLFCN_H=1 HAVE_DCGETTEXT=1 HAVE_GETTEXT=1 HAVE_LOCALE_H=1 HAVE_GSSAPI_GSSAPI_H=1 HAVE_LANGINFO_CODESET=1 -- 2.11.4.GIT