[Pkg-owncloud-commits] [owncloud] 10/12: Imported Upstream version 7.0.6~rc2~dfsg

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 563b3ea0a2ee9d3ec78df0d05db1c08ecd91faea
Merge: 04fd509 5464298
Author: David Prévot <taffit at debian.org>
Date:   Mon Jun 1 20:52:37 2015 -0400

    Imported Upstream version 7.0.6~rc2~dfsg

 apps/files/ajax/list.php                            |  2 +-
 apps/files_external/3rdparty/Dropbox/OAuth/Curl.php | 10 ++++++++--
 apps/files_external/3rdparty/smb4php/smb.php        |  5 +++++
 apps/user_ldap/group_ldap.php                       |  2 +-
 lib/private/files/filesystem.php                    |  9 +++++++++
 lib/private/route/router.php                        |  2 ++
 themes/README                                       |  1 -
 version.php                                         |  6 +++---
 8 files changed, 29 insertions(+), 8 deletions(-)

diff --cc version.php
index d14ec3f,2c26d90..7e25a76
--- a/version.php
+++ b/version.php
@@@ -1,6 -1,19 +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(7, 0, 6, 1);
 -
 -// The human readable string
 -$OC_VersionString='7.0.6 RC2';
 -
 -// The ownCloud edition
 -$OC_Edition='';
 -
 -// The ownCloud channel
 -$OC_Channel='git';
 -
 -// The build number
 -$OC_Build='';
 -
 +<?php 
- $OC_Version = array(7,0,6,0);
- $OC_VersionString = '7.0.6 RC1';
++$OC_Version = array(7,0,6,1);
++$OC_VersionString = '7.0.6 RC2';
 +$OC_Edition = '';
 +$OC_Channel = 'testing';
- $OC_Build = '2015-05-29T18:14:10+00:00 927cae7efcb0a3c820dcd69878b890b404d35cbc';
++$OC_Build = '2015-06-01T23:23:10+00:00 54642984b1d26bfcfb7ae188d828c4a3803c218b';

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