[Pkg-owncloud-commits] [owncloud] 77/85: 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 6.0
in repository owncloud.

commit d2dfd48e2f105da1832e3b6d20c2ddbdbd07f9e5
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-Sabre-and-Patchwork-path.patch | 23 ++++++++++------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 0a2cc4c..f661a0f 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends: apache2 | httpd,
          libphp-phpmailer,
          mediawiki-classes | mediawiki (>= 1:1.19),
          owncloud-doc,
-         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 de5df6d..b1d0635 100644
--- a/debian/install
+++ b/debian/install
@@ -9,7 +9,6 @@ settings	usr/share/owncloud
 themes		var/lib/owncloud
 
 # Third party
-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
 3rdparty/zxcvbn/js/zxcvbn.js	usr/share/owncloud/3rdparty/zxcvbn/js
diff --git a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
index 0c2bc0f..5d991a5 100644
--- a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
+++ b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
@@ -1,26 +1,22 @@
 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, Sabre and Patchwork 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-sabre-dav, php-sabre-vobject, and
 php-patchwork-utf8.
 
-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-06-16
+
+Gbp: Topic path
 ---
- lib/base.php | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ lib/base.php | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/lib/base.php b/lib/base.php
-index efaeb4b..d148cae 100644
+index efaeb4b..853c994 100644
 --- a/lib/base.php
 +++ b/lib/base.php
 @@ -435,13 +435,13 @@ class OC {
@@ -28,13 +24,14 @@ index efaeb4b..d148cae 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('Sabre\\VObject', '3rdparty');
 -		self::$loader->registerPrefix('Sabre_', '3rdparty');
 -		self::$loader->registerPrefix('Patchwork', '3rdparty');
++		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('Sabre\\VObject', '/usr/share/php');

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