From f83f4b9bcab88d926a3837e4e5bdb7e4cfc18332 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Tue, 12 Apr 2016 20:46:12 +0300 Subject: [PATCH] update files in preparation for next release --- ChangeLog | 4 +++- NEWS | 15 +++++++++++---- VERSION | 2 +- contrib/debian/changelog | 16 ++++++++++++++++ contrib/opensuse-build-service/PKGBUILD | 2 +- .../opensuse-build-service/pidgin-sipe-gstreamer1.dsc | 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 +- 12 files changed, 50 insertions(+), 14 deletions(-) rewrite NEWS (100%) diff --git a/ChangeLog b/ChangeLog index 86791d9d..461433d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -version 1.21.0 "Lync File Transfer" (????-??-??) +version 1.21.0 "Lync File Transfer" (2016-??-??) - Feature #91: Support embedded XML as buddy photo URL (Stefan Becker) - Feature #90: Add AppStream metadata file (Jiri Eischmann, Stefan Becker) - Feature #89: Improve "Join scheduled conference" dialog (Stefan Becker) @@ -6,6 +6,8 @@ version 1.21.0 "Lync File Transfer" (????-??-??) - Feature #85: XML raw extract should ignore name space (Stefan Becker) - Fixed #293: Mandatory wsa:MessageID node missing (Stefan Becker) - add support for Lync File Transfer protocol (Jakub Adam) + * requires libpurple >= 2.12.0 + * Lync FT will be used for sending files when Lync 2013 is detected - add build options to "About SIPE plugin" message (Stefan Becker) version 1.20.1 "Bug Fixes I" (2015-10-24) diff --git a/NEWS b/NEWS dissimilarity index 100% index 0fe89900..5f87bc88 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,11 @@ -version 1.20.1 "Bug Fixes I" (2015-10-24) - - add support for another type of ADFS response (Stefan Becker) - - improve configure check for back-ported features (Stefan Becker, Jakub Adam) - - updated translations: French (fr), Russian (ru) +version 1.21.0 "Lync File Transfer" (2016-??-??) + - Feature #91: Support embedded XML as buddy photo URL (Stefan Becker) + - Feature #90: Add AppStream metadata file (Jiri Eischmann, Stefan Becker) + - Feature #89: Improve "Join scheduled conference" dialog (Stefan Becker) + - Feature #87: Support multiple HTTP cookies (Stefan Becker) + - Feature #85: XML raw extract should ignore name space (Stefan Becker) + - Fixed #293: Mandatory wsa:MessageID node missing (Stefan Becker) + - add support for Lync File Transfer protocol (Jakub Adam) + * requires libpurple >= 2.12.0 + * Lync FT will be used for sending files when Lync 2013 is detected + - add build options to "About SIPE plugin" message (Stefan Becker) diff --git a/VERSION b/VERSION index 0044d6cb..3500250a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.20.1 +1.21.0 diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 5a0c97d6..d130bc93 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,19 @@ +pidgin-sipe (1.21.0-1) unstable; urgency=low + + * New upstream version 1.21.0 "Lync File Transfer" (2016-??-??) + - Feature #91: Support embedded XML as buddy photo URL (Stefan Becker) + - Feature #90: Add AppStream metadata file (Jiri Eischmann, Stefan Becker) + - Feature #89: Improve "Join scheduled conference" dialog (Stefan Becker) + - Feature #87: Support multiple HTTP cookies (Stefan Becker) + - Feature #85: XML raw extract should ignore name space (Stefan Becker) + - Fixed #293: Mandatory wsa:MessageID node missing (Stefan Becker) + - add support for Lync File Transfer protocol (Jakub Adam) + * requires libpurple >= 2.12.0 + * Lync FT will be used for sending files when Lync 2013 is detected + - add build options to "About SIPE plugin" message (Stefan Becker) + + -- Stefan Becker Tue, 12 Apr 2016 20:41:00 +0300 + pidgin-sipe (1.20.1-1) unstable; urgency=low * New upstream version 1.20.1 "Bug Fixes I" (2015-10-24) diff --git a/contrib/opensuse-build-service/PKGBUILD b/contrib/opensuse-build-service/PKGBUILD index 3eee8ffd..3c4ac492 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.20.1 +pkgver=1.21.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-gstreamer1.dsc b/contrib/opensuse-build-service/pidgin-sipe-gstreamer1.dsc index cc2041a7..e2e33c0e 100644 --- a/contrib/opensuse-build-service/pidgin-sipe-gstreamer1.dsc +++ b/contrib/opensuse-build-service/pidgin-sipe-gstreamer1.dsc @@ -1,6 +1,6 @@ Format: 3.0 (quilt) Source: pidgin-sipe -Version: 1.20.1-1 +Version: 1.21.0-1 Binary: pidgin-sipe Maintainer: pidgin-sipe Architecture: any diff --git a/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc b/contrib/opensuse-build-service/pidgin-sipe-telepathy.dsc index 932a9d80..8b11f2f8 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.20.1-1 +Version: 1.21.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 3271518d..9b1e5a9d 100644 --- a/contrib/opensuse-build-service/pidgin-sipe.changes +++ b/contrib/opensuse-build-service/pidgin-sipe.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 12 17:32:00 UTC 2016 - chemobejk@gmail.com + +- Update to version 1.21.0: + +------------------------------------------------------------------- Fri Feb 12 09:26:02 UTC 2016 - dimstar@opensuse.org - Pass --disable-quality-check to configure: the 'quality' checks diff --git a/contrib/opensuse-build-service/pidgin-sipe.spec b/contrib/opensuse-build-service/pidgin-sipe.spec index ac23b289..34557935 100644 --- a/contrib/opensuse-build-service/pidgin-sipe.spec +++ b/contrib/opensuse-build-service/pidgin-sipe.spec @@ -146,7 +146,7 @@ Name: pidgin-sipe %endif %endif Summary: Pidgin protocol plugin to connect to MS Office Communicator -Version: 1.20.1 +Version: 1.21.0 Release: 1 Source: pidgin-sipe-%{version}.tar.gz Group: %{pkg_group} @@ -570,6 +570,9 @@ rm -rf %{buildroot} %changelog +* DDD MMM DD 2016 J. D. User 1.21.0 +- update to 1.21.0 + * Tue Apr 05 2016 J. D. User 1.20.1-*git* - align with Fedora SPEC file diff --git a/contrib/rpm/pidgin-sipe.spec b/contrib/rpm/pidgin-sipe.spec index a465a218..4ee63a6b 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.20.1 +Version: 1.21.0 %if 0%{?_with_git:1} Release: %{gitcount}.%{git}%{?dist} Source0: %{name}-%{git}.tar.bz2 @@ -301,6 +301,9 @@ rm -rf %{buildroot} %changelog +* DDD MMM DD 2016 J. D. User 1.21.0 +- update to 1.21.0 + * Tue Apr 05 2016 J. D. User 1.20.1-*git* - align with Fedora SPEC file diff --git a/siplcs.vcxproj b/siplcs.vcxproj index d443a86d..2e676182 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.20.1";PACKAGE_URL="http://sipe.sourceforge.net/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.20.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.21.0";PACKAGE_URL="http://sipe.sourceforge.net/";PACKAGE_BUGREPORT="https://sourceforge.net/p/sipe/bugs/";SIPE_VERSION="1.21.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.20.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.20.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.21.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.21.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 1aa3fc1e..816c38f9 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.20.1 +PACKAGE_VERSION=1.21.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