[commits] Horde branch develop updated. 460daee9b54493fe1357e029da656067ce69e8cb

[Jan Schneider]

The branch "develop" has been updated.
The following is a summary of the commits.

from: 749410d12dc7ce66f7c340d84c3de8bfc1c65aa0

3a4e1bc Update file list.
4fa9609 Revert "Revert "Fix botched merges.""
a69953d Prepare releases.
6fa3c31 Swapped states.
374138b Skip incomplete and broken tests.
460daee [jan] Use new version name scheme, matching PEAR's.

-----------------------------------------------------------------------

commit 3a4e1bcf2b8e06181e306f7a84879bbc65a014e6
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 4 19:15:01 2012 +0200

    Update file list.

 imp/package.xml |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/3a4e1bcf2b8e06181e306f7a84879bbc65a014e6

-----------------------------------------------------------------------

commit 4fa96098643f79a48f20708d6a2931e9bbb43c30
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 4 19:16:51 2012 +0200

    Revert "Revert "Fix botched merges.""
    
    This reverts commit ff1c0a8415a974362929fea07a12e54be1d50737.
    
    Conflicts:
    
    	imp/package.xml
    	kronolith/package.xml

 horde/package.xml     |    8 +++++++-
 imp/package.xml       |    5 ++++-
 ingo/package.xml      |    5 ++++-
 kronolith/package.xml |   16 +++++++++++++---
 nag/package.xml       |    2 +-
 turba/package.xml     |    3 ++-
 whups/package.xml     |    5 ++---
 7 files changed, 33 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/4fa96098643f79a48f20708d6a2931e9bbb43c30

-----------------------------------------------------------------------

commit a69953d299dc80984ce84669a71481265fb40c12
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 4 19:43:14 2012 +0200

    Prepare releases.

 framework/ActiveSync/package.xml  |    8 +-
 framework/Auth/package.xml        |   20 +++++-
 framework/Core/package.xml        |   39 ++++++++++-
 framework/Data/package.xml        |   24 ++++++-
 framework/Exception/package.xml   |   25 ++++++-
 framework/Imap_Client/package.xml |   22 ++++++-
 framework/Mail/package.xml        |   20 +++++-
 framework/Mime/package.xml        |   22 ++++++-
 framework/Util/package.xml        |   22 ++++++-
 framework/Vfs/package.xml         |   20 +++++-
 horde/docs/CHANGES                |    1 +
 horde/package.xml                 |   36 +++++++++-
 imp/package.xml                   |  135 +++++++++++++++++++++++++++++++++++--
 13 files changed, 361 insertions(+), 33 deletions(-)

http://git.horde.org/horde-git/-/commit/a69953d299dc80984ce84669a71481265fb40c12

-----------------------------------------------------------------------

commit 6fa3c314f08d36a56f61166a5654dc782d9b0f0d
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 4 21:54:35 2012 +0200

    Swapped states.

 .../Components/Unit/Components/Helper/VersionStabilityTest.php    |    6 ++--
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/6fa3c314f08d36a56f61166a5654dc782d9b0f0d

-----------------------------------------------------------------------

commit 374138b1d648de20a9dbbd92916a084ecd6894a4
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 4 22:01:16 2012 +0200

    Skip incomplete and broken tests.

 .../Components/Integration/Components/Module/DocumentTest.php     |    2 ++
 components/test/Components/StoryTestCase.php                      |    2 ++
 .../test/Components/Unit/Components/Helper/DocsOriginTest.php     |    2 ++
 .../Components/Unit/Components/Release/Task/TimestampTest.php     |    2 ++
 4 files changed, 8 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/374138b1d648de20a9dbbd92916a084ecd6894a4

-----------------------------------------------------------------------

commit 460daee9b54493fe1357e029da656067ce69e8cb
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 4 22:14:02 2012 +0200

    [jan] Use new version name scheme, matching PEAR's.

 components/lib/Components/Helper/Version.php                      |   83 +---
 components/lib/Components/Release/Task/Announce.php               |    2 +-
 components/lib/Components/Release/Task/Bugs.php                   |    4 +-
 components/lib/Components/Release/Task/CurrentSentinel.php        |    4 +-
 components/lib/Components/Release/Task/NextSentinel.php           |    4 +-
 components/package.xml                                            |    2 +
 .../Components/Unit/Components/Helper/VersionDescriptionTest.php  |   18 +-
 components/test/Components/Unit/Components/Helper/VersionTest.php |  120 -----
 .../Unit/Components/Release/Task/CurrentSentinelTest.php          |   30 +-
 .../Components/Unit/Components/Release/Task/NextSentinelTest.php  |   12 +-
 10 files changed, 41 insertions(+), 238 deletions(-)

http://git.horde.org/horde-git/-/commit/460daee9b54493fe1357e029da656067ce69e8cb