[Pkg-owncloud-commits] [owncloud] 05/08: Imported Upstream version 6.0.0+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 2fe69f339afb8e333c1611619b49fa932227c0c7
Merge: a48c6bd 5ac339b
Author: David Prévot <taffit at debian.org>
Date:   Tue Dec 10 12:31:06 2013 -0400

    Imported Upstream version 6.0.0+dfsg

 config/config.sample.php             |   3 +++
 core/js/js.js                        |   2 +-
 core/skeleton/ownCloudUserManual.pdf | Bin 1393288 -> 1393293 bytes
 lib/private/l10n.php                 |   2 +-
 version.php                          |   8 ++++----
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --cc config/config.sample.php
index ba06896,1070ef7..1070ef7
mode 100644,100755..100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
diff --cc core/skeleton/ownCloudUserManual.pdf
index 287bc77,0000000..d3bae10
mode 100644,000000..100644
Binary files differ
diff --cc version.php
index f9aa6c3,8d97b3a..c292355
--- 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, 00, 0, 13);
 -
 -// The human readable string
 -$OC_VersionString='6.0';
 -
 -// The ownCloud edition
 -$OC_Edition='';
 -
 -// The ownCloud channel
 -$OC_Channel='git';
 -
 -// The build number
 -$OC_Build='';
 -
 +<?php 
- $OC_Version = array(6,0,0,12);
- $OC_VersionString = '6.0 RC4';
++$OC_Version = array(6,0,0,13);
++$OC_VersionString = '6.0';
 +$OC_Edition = '';
- $OC_Channel = 'testing';
- $OC_Build = '2013-12-06T20:13:14+00:00';
++$OC_Channel = 'stable';
++$OC_Build = '2013-12-10T10:56:53+00:00';

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