[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.6+dfsg-1-5-g87266d0

[David Prévot]

The following commit has been merged in the master branch:
commit 1d27785bf84c3996759fb621cfa52ddccb4a659a
Author: David Prévot <taffit at debian.org>
Date:   Mon Jun 3 09:54:26 2013 -0400

    Adapt to files_encryption come back

diff --git a/debian/copyright b/debian/copyright
index a610d64..a719ad6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,6 +19,7 @@ Copyright: 2010-2012, Frank Karlitschek <frank at owncloud.org>
            2010-2012, Bartek Przybylski <bart.p.pl at gmail.com>
            2011-2012, Thomas Tanghus <thomas at tanghus.net>
            2011, Christopher Blum
+           2011, Dominik Schmidt dev at dominik-schmidt.de
            2012-2013, Victor Dubiniuk <victor.dubiniuk at gmail.com>
            2012, Erik Sargent <esthepiking at gmail.com>
            2012, Manuel Deglado <manuel.delgado at ucr.ac.cr>
@@ -28,11 +29,12 @@ Copyright: 2010-2012, Frank Karlitschek <frank at owncloud.org>
            2012-2013, Bjoern Schiessle <schiessle at owncloud.com>
            2012-2013, Thomas Müller <thomas.mueller at tmit.eu>
            2013, Klaas Freitag
-           2012, Sam Tuke <samtuke at owncloud.com>
+           2012-2013, Sam Tuke <samtuke at owncloud.com>
            2013, Simon Birnbach
            2013, Lukas Reschke <lukas at statuscode.ch>
            2013, Christian Reiner
            2013, Daniel Molkentin
+           2013, Florin Peter <owncloud at florin-peter.de>
 License: AGPL-3+
 
 Files: 3rdparty/Archive/Tar.php
diff --git a/debian/rules b/debian/rules
index 9cd3f9f..2e6cd09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,9 +39,11 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/Changelog
 	rm debian/owncloud/usr/share/owncloud/apps/files_antivirus/README.md
+	rm debian/owncloud/usr/share/owncloud/apps/files_encryption/appinfo/spec.txt
 	rm debian/owncloud/usr/share/owncloud/apps/updater/README
 	rm debian/owncloud/usr/share/owncloud/core/img/filetypes/readme*.txt
 	rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_encryption/tests
 	rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
 
 	# Remove unused scripts and sources.

-- 
owncloud.git