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

[David Prévot]

The following commit has been merged in the master branch:
commit 9f3c6dc4d7d011319fb9711ed45d21ef0b7ef20f
Author: David Prévot <taffit at debian.org>
Date:   Sun May 5 21:54:13 2013 -0400

    Depend on php-aws-sdk

diff --git a/debian/control b/debian/control
index b9b21da..352e8eb 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud.git
 Package: owncloud
 Architecture: all
 Depends: apache2 | httpd,
-         ca-certificates,
          libjs-jquery (>= 1.7.2-1),
          libjs-jquery-jplayer,
          libjs-jquery-ui,
@@ -21,6 +20,7 @@ Depends: apache2 | httpd,
          mediawiki (>= 1:1.19),
          owncloud-doc,
          owncloud-mysql (= ${source:Version}) | owncloud-sqlite (= ${source:Version}),
+         php-aws-sdk,
          php-crypt-blowfish,
          php-getid3 (>= 1.9.3-1),
          php-mdb2,
diff --git a/debian/owncloud.install b/debian/owncloud.install
index 610689f..0063399 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -13,7 +13,6 @@ themes/* /var/lib/owncloud/themes
 # Third party stuff.
 3rdparty/Dropbox	/usr/share/owncloud/3rdparty
 3rdparty/Google		/usr/share/owncloud/3rdparty
-3rdparty/aws-sdk	/usr/share/owncloud/3rdparty
 3rdparty/css /usr/share/owncloud/3rdparty
 3rdparty/fontawesome	/usr/share/owncloud/3rdparty
 3rdparty/fullcalendar /usr/share/owncloud/3rdparty
diff --git a/debian/owncloud.links b/debian/owncloud.links
index e835fe2..6e7ae18 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -14,6 +14,3 @@ usr/share/javascript/jquery-jplayer/jquery.jplayer.min.js usr/share/owncloud/app
 usr/share/javascript/jquery-jplayer/add-on usr/share/owncloud/apps/media/js/add-on
 usr/share/javascript/jquery-ui/jquery-ui.min.js	usr/share/owncloud/core/js/jquery-ui-1.10.0.custom.js
 usr/share/php/Zend usr/share/owncloud/apps/search_lucene/3rdparty/Zend
-
-# Use local cacert instead of embedded one
-etc/ssl/certs/ca-certificates.crt	/usr/share/owncloud/3rdparty/aws-sdk/lib/requestcore/cacert.pem
diff --git a/debian/patches/fix_aws-sdk.diff b/debian/patches/fix_aws-sdk.diff
new file mode 100644
index 0000000..522ea78
--- /dev/null
+++ b/debian/patches/fix_aws-sdk.diff
@@ -0,0 +1,16 @@
+Description: Adapt aws-sdk path
+ The Debian package depends on the needed classes instead of embedding them.
+Author: David Prévot <taffit at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-05-02
+--- a/apps/files_external/lib/amazons3.php
++++ b/apps/files_external/lib/amazons3.php
+@@ -22,7 +22,7 @@
+ 
+ namespace OC\Files\Storage;
+ 
+-require_once 'aws-sdk/sdk.class.php';
++require_once 'AWSSDKforPHP/sdk.class.php';
+ 
+ class AmazonS3 extends \OC\Files\Storage\Common {
+ 
diff --git a/debian/patches/series b/debian/patches/series
index da0934c..7b3c532 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix_tar_require.diff
 fix_mediawiki.diff
 fix_upgrade.diff
 fix_displayed_version.diff
+fix_aws-sdk.diff
diff --git a/debian/rules b/debian/rules
index bf8b318..d519607 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,6 @@ override_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/aws-sdk/lib/cachecore/LICENSE
-	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/requestcore/LICENSE
-	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/yaml/LICENSE
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/LICENSE.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/miniColors/*-LICENSE.txt
@@ -35,12 +32,6 @@ override_dh_install:
 
 	# Remove other stuff
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Dropbox/README.md
-	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/README.md
-	rm -r debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/_docs
-	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/cachecore/README
-	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/cachecore/_sql/README
-	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/requestcore/README.md
-	rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/yaml/README.markdown
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fontawesome/README.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/VERSION

-- 
owncloud.git