[Pkg-owncloud-commits] [owncloud] 02/02: Depend on php-dropbox

[David Prévot]

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

taffit pushed a commit to branch 5.0
in repository owncloud.

commit 71517e589913d9da6918bcfc501f3f051d3d665f
Author: David Prévot <taffit at debian.org>
Date:   Wed Oct 23 13:27:16 2013 -0400

    Depend on php-dropbox
    
    Drop the embedded copy.
    
    Conflicts:
    	debian/control
    	debian/patches/series
    	debian/rules
---
 debian/control          | 1 +
 debian/owncloud.install | 1 -
 debian/rules            | 2 --
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 78907cd..b1dd0a6 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Depends: apache2 | httpd,
          owncloud-mysql (= ${source:Version}) | owncloud-pgsql (= ${source:Version}) | owncloud-sqlite (= ${source:Version}),
          php-aws-sdk (<< 2~),
          php-crypt-blowfish,
+         php-dropbox,
          php-getid3 (>= 1.9.3-1),
          php-google-api-php-client,
          php-irods-prods,
diff --git a/debian/owncloud.install b/debian/owncloud.install
index 278885d..0cc9dd6 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -11,7 +11,6 @@ settings /usr/share/owncloud
 themes/* /var/lib/owncloud/themes
 
 # Third party stuff.
-3rdparty/Dropbox	/usr/share/owncloud/3rdparty
 3rdparty/Google		/usr/share/owncloud/3rdparty
 3rdparty/fullcalendar /usr/share/owncloud/3rdparty
 3rdparty/openid		/usr/share/owncloud/3rdparty
diff --git a/debian/rules b/debian/rules
index 7c7563b..cad9904 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ override_dh_install:
 	dh_install
 
 	# Remove redundant license files as it is already captured in debian/copyright.
-	rm debian/owncloud/usr/share/owncloud/3rdparty/Dropbox/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Google/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
@@ -25,7 +24,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
 
 	# Remove other useless documentation
-	rm debian/owncloud/usr/share/owncloud/3rdparty/Dropbox/README.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/AUTHORS
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/Changelog
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/README

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