[Pkg-owncloud-commits] [owncloud] 02/02: assetic

[David Prévot]

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

taffit pushed a commit to branch wip/stable8
in repository owncloud.

commit 9c0d878e99c3d4185af9ed5ccd6e106fdab35292
Author: David Prévot <taffit at debian.org>
Date:   Thu Apr 2 14:27:48 2015 -0400

    assetic
---
 debian/autoload.php | 3 +--
 debian/control      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/autoload.php b/debian/autoload.php
index 10f12cd..80d8d23 100644
--- a/debian/autoload.php
+++ b/debian/autoload.php
@@ -15,6 +15,7 @@ $loader->addPrefixes(array(
 // Prefer loading via provided autoloader
 require_once 'Sabre/autoload.php';
 require_once 'ZipStreamer/autoload.php';
+require_once 'Assetic/autoload.php';
 require_once 'libphp-phpmailer/PHPMailerAutoload.php';
 require_once 'phpseclib.autoloader.php';
 require_once 'getid3/autoload.php';
@@ -28,12 +29,10 @@ require_once 'Pimple/autoload.php';
 
 // TODO:
 // require_once 'Doctrine/DBAL/autoload.php'; // add it in some version
-// kriswallsmith/assetic: Needs Symfony
 // phpmailer/phpmailer: maybe improve via an actual classloader
 // rackspace/php-opencloud: Needs Guzzle
 // bantu/ini-get-wrapper
 // pear/pear_exception
 
 // Load additional files as registered in composer
-require_once 'Assetic/functions.php';
 require_once 'Archive/Tar.php';
diff --git a/debian/control b/debian/control
index a6dc6cf..1d6dff0 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Depends: libjs-handlebars,
          libjs-underscore (>= 1.6),
          libphp-phpmailer (>= 5.2.7),
          owncloud-doc,
-         php-assetic,
+         php-assetic (>= 1.2.1-2~),
          php-cssmin,
          php-doctrine-dbal (>= 2.5.1),
          php-getid3 (>= 1.9.9+dfsg-2~),

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