[Pkg-owncloud-commits] [owncloud] 76/85: Depend on php-pimple instead of the embeded class

[David Prévot]

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

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 6fc9f75c1d7d6aa5db4c8a004cad5d2c6695cc59
Author: David Prévot <taffit at debian.org>
Date:   Mon May 26 22:22:14 2014 -0400

    Depend on php-pimple instead of the embeded class
---
 debian/control                                     |  1 +
 debian/install                                     |  1 -
 ...17-Disable-Flash-and-Silverlight-plugins.patch} |  0
 debian/patches/path/0016-Adapt-Pimple-path.patch   | 26 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++-
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index da29cdc..0a2cc4c 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Depends: apache2 | httpd,
          php-getid3 (>= 1.9.5~),
          php-patchwork-utf8,
          php-pear,
+         php-pimple (<< 2),
          php-sabre-dav (<< 1.8),
          php-sabre-vobject (<< 3),
          php-symfony-console,
diff --git a/debian/install b/debian/install
index 735df05..de5df6d 100644
--- a/debian/install
+++ b/debian/install
@@ -9,7 +9,6 @@ settings	usr/share/owncloud
 themes		var/lib/owncloud
 
 # Third party
-3rdparty/Pimple			usr/share/owncloud/3rdparty
 3rdparty/doctrine/dbal/lib	usr/share/owncloud/3rdparty/doctrine/dbal
 3rdparty/js/md5/md5.js		usr/share/owncloud/3rdparty/js/md5
 3rdparty/phpass			usr/share/owncloud/3rdparty
diff --git a/debian/patches/0016-Disable-Flash-and-Silverlight-plugins.patch b/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch
similarity index 100%
rename from debian/patches/0016-Disable-Flash-and-Silverlight-plugins.patch
rename to debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch
diff --git a/debian/patches/path/0016-Adapt-Pimple-path.patch b/debian/patches/path/0016-Adapt-Pimple-path.patch
new file mode 100644
index 0000000..701f97d
--- /dev/null
+++ b/debian/patches/path/0016-Adapt-Pimple-path.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Mon, 16 Jun 2014 15:49:59 -0400
+Subject: Adapt Pimple path
+
+The Debian package depends on the needed classes instead of embedding
+them, i.e. php-pimple.
+
+Forwarded: not-needed
+Gbp: Topic path
+---
+ lib/private/appframework/utility/simplecontainer.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
+index 7e4db63..126445b 100644
+--- a/lib/private/appframework/utility/simplecontainer.php
++++ b/lib/private/appframework/utility/simplecontainer.php
+@@ -3,7 +3,7 @@
+ namespace OC\AppFramework\Utility;
+ 
+ // register 3rdparty autoloaders
+-require_once __DIR__ . '/../../../../3rdparty/Pimple/Pimple.php';
++require_once 'Pimple.php';
+ 
+ /**
+  * Class SimpleContainer
diff --git a/debian/patches/series b/debian/patches/series
index 9eaea3d..e32664f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,5 @@ path/0012-Adapt-google-api-php-client-path.patch
 path/0013-Adapt-Dropbox-path.patch
 path/0014-Adapt-php-opencloud-path.patch
 path/0015-Adapt-Zend-path.patch
-0016-Disable-Flash-and-Silverlight-plugins.patch
+path/0016-Adapt-Pimple-path.patch
+0017-Disable-Flash-and-Silverlight-plugins.patch

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