[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-56-g5989f3c

[David Prévot]

The following commit has been merged in the master branch:
commit c8b53e951dede419c795c1bd629740fc47e97bcf
Author: David Prévot <taffit at debian.org>
Date:   Wed Mar 27 19:42:06 2013 -0400

    Add back experimental feature files_external

diff --git a/debian/changelog b/debian/changelog
index c00fc65..9d3097d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ owncloud (5.0.0+dfsg-1) UNRELEASED; urgency=low
     - Adapt to updated JQuery UI version
     - Adapt to libjs-underscore
   * debian/owncloud.install: Update 3dparty list
+  * Add back experimental feature files_external
 
  -- Paul van Tilburg <paulvt at debian.org>  Fri, 02 Nov 2012 22:20:35 +0100
 
diff --git a/debian/copyright b/debian/copyright
index f823e44..563c100 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,6 +24,7 @@ Copyright: 2010-2012, Frank Karlitschek <frank at owncloud.org>
            2012, Manuel Deglado <manuel.delgado at ucr.ac.cr>
            2012, Jörn Dreyer <jfd at butonic.de>
            2012, Stefan Herbrechtsmeier <stefan at herbrechtsmeier.net>
+           2012-2013, Henrik Kjölhede <hkjolhede at gmail.com>
            2012-2013, Bjoern Schiessle <schiessle at owncloud.com>
            2012-2013, Thomas Müller <thomas.mueller at tmit.eu>
            2013, Klaas Freitag
@@ -373,6 +374,10 @@ License: public-domain
  Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed
  in the public domain.  Revised in subsequent years, still public domain.
 
+Files: 3rdparty/smb4php/*
+Copyright: 2007, Victor M. Varela <vmvarela at gmail.com>
+License: GPL-2+
+
 Files: 3rdparty/symfony/*
 Copyright: 2004-2012, Fabien Potencier
 License: Expat
@@ -417,6 +422,10 @@ Files: apps/files/js/jquery-visibility.js
 Copyright: 2012, Mathias Bynens
 License: Expat or GPL-2 
 
+Files: apps/files_external/3rdparty/phpseclib/*
+Copyright: 2006-2012, Jim Wigginton <terrafrost at php.net>
+License: Expat
+
 Files: apps/files_imageviewer/js/jquery.fancybox-1.3.4*js
 Copyright: 2008-2010, Janis Skarnelis
 License: Expat or GPL-2
diff --git a/debian/rules b/debian/rules
index 631a90e..0af45cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
 	rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/LICENSE
 	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/*-LICENSE.txt
+	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/phpseclib/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/css/DroidSansMono/Google\ Android\ License.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/LICENSE
@@ -46,6 +47,8 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/README
 	rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/README.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
+	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/phpseclib/AUTHORS
+	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/phpseclib/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/files_antivirus/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/updater/README
 	# TODO: build owncloud/core/doc, or drop it
@@ -59,6 +62,7 @@ override_dh_install:
 	# Remove unused scripts and sources.
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/phpass/c
 	rm debian/owncloud/usr/share/owncloud/3rdparty/phpass/test.php
+	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/phpseclib/phpunit.xml.dist
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_odfviewer/src
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_videoviewer/mediaelement
 	rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl

-- 
owncloud.git