[Pkg-owncloud-commits] [owncloud] 15/21: Imported Upstream version 6.0.4+dfsg

[David Prévot]

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

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 166fcee2a6ad5539d7d72becded596ede41c04dd
Merge: 1d7c24b e4fb6d5
Author: David Prévot <taffit at debian.org>
Date:   Tue Jun 24 12:13:30 2014 -0400

    Imported Upstream version 6.0.4+dfsg

 3rdparty/doctrine/common/.travis.yml |  10 ---
 3rdparty/doctrine/common/build.xml   |  59 -------------
 3rdparty/doctrine/dbal/.travis.yml   |  22 -----
 3rdparty/doctrine/dbal/build.xml     |  91 --------------------
 apps/contacts/.travis.yml            |  32 -------
 apps/user_ldap/lib/access.php        |  20 ++++-
 apps/user_ldap/lib/connection.php    |  19 ++++-
 apps/user_ldap/lib/helper.php        |   3 +-
 apps/user_ldap/lib/wizard.php        | 159 +++++++++++++++++++++++------------
 apps/user_ldap/tests/wizard.php      |   4 +-
 lib/private/setup.php                |   8 +-
 version.php                          |   8 +-
 12 files changed, 150 insertions(+), 285 deletions(-)

diff --cc version.php
index a2b2ad4,6236af9..d40f957
--- a/version.php
+++ b/version.php
@@@ -1,6 -1,17 +1,6 @@@
 -<?php
 -
 -// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number.
 -$OC_Version=array(6, 0, 4, 1);
 -
 -// The human readable string
 -$OC_VersionString='6.0.4';
 -
 -// The ownCloud edition
 -$OC_Edition='';
 -
 -// The ownCloud channel
 -$OC_Channel='git';
 -
 -// The build number
 -$OC_Build='';
 -
 +<?php 
- $OC_Version = array(6,0,4,0);
- $OC_VersionString = '6.0.4 beta 1';
++$OC_Version = array(6,0,4,1);
++$OC_VersionString = '6.0.4';
 +$OC_Edition = '';
- $OC_Channel = 'testing';
- $OC_Build = '2014-06-17T07:40:06+00:00';
++$OC_Channel = 'stable';
++$OC_Build = '2014-06-24T15:11:49+00:00';

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