[Pkg-owncloud-commits] [owncloud] 02/02: Depend on php-symfony-routing

[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 801a867dc1757f353710903b51735c2725febc42
Author: David Prévot <taffit at debian.org>
Date:   Thu Aug 8 09:58:09 2013 +0200

    Depend on php-symfony-routing
---
 debian/control                   |    1 +
 debian/owncloud.install          |    1 -
 debian/patches/fix_symphony.diff |   16 ++++++++++++++++
 debian/patches/series            |    1 +
 debian/rules                     |    3 ---
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index c48c8f5..859ab6b 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Depends: apache2 | httpd,
          php-sabre-dav (<< 1.8~),
          php-sabre-vobject,
          php-seclib,
+         php-symfony-routing,
          php-xml-parser,
          php5,
          php5-curl,
diff --git a/debian/owncloud.install b/debian/owncloud.install
index f6a89a4..8ed2379 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -19,7 +19,6 @@ themes/* /var/lib/owncloud/themes
 3rdparty/openid		/usr/share/owncloud/3rdparty
 3rdparty/php-cloudfiles /usr/share/owncloud/3rdparty
 3rdparty/phpass /usr/share/owncloud/3rdparty
-3rdparty/symfony	/usr/share/owncloud/3rdparty
 
 # Files.
 db_structure.xml /usr/share/owncloud
diff --git a/debian/patches/fix_symphony.diff b/debian/patches/fix_symphony.diff
new file mode 100644
index 0000000..de46c29
--- /dev/null
+++ b/debian/patches/fix_symphony.diff
@@ -0,0 +1,16 @@
+Description: Adapt symphony 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-08-08
+--- a/lib/base.php
++++ b/lib/base.php
+@@ -107,7 +107,7 @@
+ 		} elseif (strpos($className, 'Sabre_') === 0) {
+ 			$path = str_replace('_', '/', $className) . '.php';
+ 		} elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) {
+-			$path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php';
++			$path = str_replace('\\', '/', $className) . '.php';
+ 		} elseif (strpos($className, 'Sabre\\VObject') === 0) {
+ 			$path = str_replace('\\', '/', $className) . '.php';
+ 		} elseif (strpos($className, 'Test_') === 0) {
diff --git a/debian/patches/series b/debian/patches/series
index 8fd3802..5f9f547 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix_displayed_version.diff
 fix_aws-sdk.diff
 fix_crypt_blowfish.diff
 fix_log_path.diff
+fix_symphony.diff
diff --git a/debian/rules b/debian/rules
index 6c14c64..1a08149 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Google/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
-	rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/css/DroidSansMono/Google\ Android\ License.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/LICENSE
@@ -32,8 +31,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/AUTHORS
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/Changelog
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/README
-	rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/composer.json
-	rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/Changelog
 	rm debian/owncloud/usr/share/owncloud/apps/files_antivirus/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/files_encryption/appinfo/spec.txt

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