[Pkg-owncloud-commits] [owncloud] 152/153: 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 master
in repository owncloud.

commit 119b03123936e99c3f54059a4cad51cec02dfce2
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 -
 ...octrine-Symphony-Patchwork-and-Pimple-path.patch} | 20 ++++++++++++--------
 debian/patches/series                                |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 0c6222a..c6d8555 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Depends: apache2 | httpd,
          php-getid3 (>= 1.9.5~),
          php-patchwork-utf8,
          php-pear,
+         php-pimple,
          php-sabre-dav (<< 1.8),
          php-sabre-vobject (<< 3),
          php-symfony-classloader,
diff --git a/debian/install b/debian/install
index 9be11c0..7be24a9 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/css/strengthify/strengthify.css	usr/share/owncloud/3rdparty/css/strengthify
 3rdparty/doctrine/dbal/lib			usr/share/owncloud/3rdparty/doctrine/dbal
 3rdparty/js/md5/md5.js				usr/share/owncloud/3rdparty/js/md5
diff --git a/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch b/debian/patches/path/0006-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
similarity index 75%
rename from debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch
rename to debian/patches/path/0006-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
index af7b934..79062d0 100644
--- a/debian/patches/path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch
+++ b/debian/patches/path/0006-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
@@ -1,28 +1,30 @@
 From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
 Date: Tue, 5 Nov 2013 20:39:36 -0400
-Subject: Adapt Doctrine, Symphony and Patchwork path
+Subject: Adapt Doctrine, Symphony, Patchwork and Pimple path
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
 The Debian package depends on the needed classes instead of embedding
 them, i.e. php-doctrine-common, php-symfony-console,
-php-symfony-routing, and php-patchwork-utf8.
+php-symfony-routing, php-patchwork-utf8 and php-pimple.
 
 php-doctrine-dbal can’t be used currently because upstream made some
 modifications that makes it incompatible with the original one.
 
 Forwarded: not-needed
-Last-Update: 2013-11-11
+Last-Update: 2014-05-26
+
+Gbp: Topic path
 ---
- lib/base.php | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ lib/base.php | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/lib/base.php b/lib/base.php
-index c4824d1..8d00b46 100644
+index c4824d1..6c6d78e 100644
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -411,11 +411,11 @@ class OC {
+@@ -411,12 +411,12 @@ class OC {
  		// register autoloader
  		require_once __DIR__ . '/autoloader.php';
  		self::$loader = new \OC\Autoloader();
@@ -32,9 +34,11 @@ index c4824d1..8d00b46 100644
 -		self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
 -		self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console');
 -		self::$loader->registerPrefix('Patchwork', '3rdparty');
+-		self::$loader->registerPrefix('Pimple', '3rdparty/Pimple');
 +		self::$loader->registerPrefix('Symfony\\Component\\Routing', '/usr/share/php');
 +		self::$loader->registerPrefix('Symfony\\Component\\Console', '/usr/share/php');
 +		self::$loader->registerPrefix('Patchwork', '/usr/share/php');
- 		self::$loader->registerPrefix('Pimple', '3rdparty/Pimple');
++		self::$loader->registerPrefix('Pimple', '/usr/share/php');
  		spl_autoload_register(array(self::$loader, 'load'));
  
+ 		// set some stuff
diff --git a/debian/patches/series b/debian/patches/series
index 61dc99f..d8a1e7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,7 @@
 0003-Improve-logfile-handling.patch
 path/0004-Adapt-class.phpmailer.php-path.patch
 path/0005-Adapt-Archive-Tar.php-path.patch
-path/0006-Adapt-Doctrine-Symphony-and-Patchwork-path.patch
+path/0006-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
 path/0007-Adapt-Crypt_Blowfish-path.patch
 path/0008-Adapt-aws-sdk-path.patch
 path/0009-Adapt-google-api-php-client-path.patch

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