[Pkg-owncloud-commits] [owncloud] 01/04: Depend on php-doctrine-dbal

[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 57284d968370efe45fdceb92ee2d98c8de57db84
Author: David Prévot <taffit at debian.org>
Date:   Sun Jun 15 12:59:22 2014 -0400

    Depend on php-doctrine-dbal
---
 debian/control                                      |  2 +-
 debian/install                                      |  1 -
 ...octrine-Symphony-Patchwork-and-Pimple-path.patch | 21 ++++++++-------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 556886b..2816444 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Depends: apache2 | httpd,
          libphp-phpmailer,
          owncloud-doc,
          php-assetic,
-         php-doctrine-common,
+         php-doctrine-dbal (>= 2.4),
          php-getid3 (>= 1.9.5~),
          php-patchwork-utf8,
          php-pear,
diff --git a/debian/install b/debian/install
index 7be24a9..d4a4358 100644
--- a/debian/install
+++ b/debian/install
@@ -10,7 +10,6 @@ themes		var/lib/owncloud
 
 # Third party
 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
 3rdparty/js/strengthify/jquery.strengthify.js	usr/share/owncloud/3rdparty/js/strengthify
 3rdparty/mcnetic/phpzipstreamer/ZipStreamer.php	usr/share/owncloud/3rdparty/mcnetic/phpzipstreamer
diff --git a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
index 8d16311..96a22f3 100644
--- a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
+++ b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
@@ -1,27 +1,21 @@
 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, 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,
+them, i.e. php-doctrine-common, php-doctrine-dbal, php-symfony-console,
 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: 2014-05-26
+Last-Update: 2014-06-15
 
 Gbp: Topic path
 ---
- lib/base.php | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ lib/base.php | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/lib/base.php b/lib/base.php
-index dadaa5f..fe20c5d 100644
+index dadaa5f..adf4422 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -426,12 +426,12 @@ class OC {
@@ -29,12 +23,13 @@ index dadaa5f..fe20c5d 100644
  		require_once __DIR__ . '/autoloader.php';
  		self::$loader = new \OC\Autoloader();
 -		self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
-+		self::$loader->registerPrefix('Doctrine\\Common', '/usr/share/php');
- 		self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
+-		self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
 -		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('Doctrine\\Common', '/usr/share/php');
++		self::$loader->registerPrefix('Doctrine\\DBAL', '/usr/share/php');
 +		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');

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