[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.5_rc1+dfsg-1-13-g4bf08ce

[David Prévot]

The following commit has been merged in the master branch:
commit 7860dd1389d10d822fbdeb6e637035c243c04413
Author: David Prévot <taffit at debian.org>
Date:   Mon May 6 17:29:49 2013 -0400

    Depend on php-seclib

diff --git a/debian/control b/debian/control
index 1a11fbe..3527f14 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Depends: apache2 | httpd,
          php-pear,
          php-sabre-dav,
          php-sabre-vobject,
+         php-seclib,
          php-xml-parser,
          php5,
          php5-curl,
diff --git a/debian/rules b/debian/rules
index 11a392b..d558aef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@ 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
@@ -40,8 +39,6 @@ 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
 	rm debian/owncloud/usr/share/owncloud/core/img/filetypes/readme*.txt
@@ -51,7 +48,6 @@ 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 -r debian/owncloud/usr/share/owncloud/l10n
@@ -97,6 +93,9 @@ override_dh_install:
 	# Remove the doc, shipped in owncloud-doc
 	rm -r debian/owncloud/usr/share/owncloud/core/doc
 
+	# Remove third party provided by external package 
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty
+
 	# Fix displayed version
 	sed -i "s/@VERSION@/$(VERSION) (Debian)/" \
 		debian/owncloud/usr/share/owncloud/settings/templates/admin.php \

-- 
owncloud.git