[Pkg-owncloud-commits] [php-sabre-vobject] 27/29: Merge tag 'upstream/4.0.0'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit b961b4117194f119b48dc1e1168d321f41471a24
Merge: f65d3c6 4774ea8
Author: David Prévot <taffit at debian.org>
Date:   Sat Dec 12 15:01:02 2015 -0400

    Merge tag 'upstream/4.0.0'
    
    Upstream version 4.0.0
    
    # gpg: Signature faite le sam. 12 déc. 2015 15:00:57 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 CHANGELOG.md                                       | 14 +++++
 README.md                                          | 39 +++++++-----
 bin/generateicalendardata.php                      | 14 ++---
 composer.json                                      | 27 ++++++++-
 lib/Component.php                                  | 18 +++---
 lib/Component/VCalendar.php                        |  2 +-
 lib/Component/VCard.php                            |  3 +-
 lib/Component/VJournal.php                         | 14 +++++
 lib/Component/VTodo.php                            | 14 +++++
 lib/FreeBusyGenerator.php                          |  6 +-
 lib/ITip/Broker.php                                |  2 +-
 lib/Parameter.php                                  |  2 +-
 lib/ParseException.php                             |  2 +-
 lib/Reader.php                                     |  5 +-
 lib/Recur/EventIterator.php                        | 27 ++++-----
 lib/Recur/RDateIterator.php                        |  7 +++
 lib/Settings.php                                   | 17 ++++++
 lib/VCardConverter.php                             |  3 +
 lib/Version.php                                    |  2 +-
 tests/VObject/BirthdayCalendarGeneratorTest.php    | 22 +++++++
 tests/VObject/CliTest.php                          | 12 +---
 tests/VObject/Component/VCalendarTest.php          | 32 ++++++++++
 tests/VObject/Component/VCardTest.php              |  2 +-
 tests/VObject/ComponentTest.php                    |  3 +-
 tests/VObject/DateTimeParserTest.php               |  2 -
 tests/VObject/DocumentTest.php                     |  4 +-
 tests/VObject/FreeBusyGeneratorTest.php            |  4 +-
 tests/VObject/ITip/BrokerAttendeeReplyTest.php     | 19 ++++++
 tests/VObject/ITip/BrokerDeleteEventTest.php       |  3 +
 tests/VObject/ITip/BrokerNewEventTest.php          | 55 ++++-------------
 tests/VObject/ITip/BrokerTester.php                |  2 +-
 tests/VObject/ITip/BrokerUpdateEventTest.php       |  5 ++
 tests/VObject/Issue153Test.php                     |  2 +-
 tests/VObject/Issue36WorkAroundTest.php            |  2 +-
 tests/VObject/Issue40Test.php                      |  4 +-
 tests/VObject/Issue96Test.php                      |  2 +-
 tests/VObject/IssueUndefinedIndexTest.php          |  1 -
 tests/VObject/JCalTest.php                         |  2 +-
 tests/VObject/Parser/QuotedPrintableTest.php       |  8 +--
 tests/VObject/Property/BinaryTest.php              |  2 +-
 tests/VObject/Property/TextTest.php                |  2 +-
 .../EventIterator/InfiniteLoopProblemTest.php      |  4 +-
 tests/VObject/Recur/EventIterator/Issue26Test.php  |  1 -
 tests/VObject/Recur/EventIterator/MainTest.php     | 69 +++++++++++-----------
 .../Recur/EventIterator/MaxInstancesTest.php       |  8 +--
 tests/VObject/Recur/RRuleIteratorTest.php          | 16 ++---
 tests/VObject/TestCase.php                         | 23 ++++++--
 tests/VObject/VCard21Test.php                      |  4 +-
 48 files changed, 343 insertions(+), 190 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git