[Pkg-owncloud-commits] [php-sabredav] 24/24: Refresh patches

David Prévot taffit at moszumanska.debian.org
Tue May 20 17:19:44 UTC 2014


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

taffit pushed a commit to branch 1.7
in repository php-sabredav.

commit 4136f70a5e381c8ee32fe2bf3c8b2ffc39894a2b
Author: David Prévot <taffit at debian.org>
Date:   Tue May 20 12:08:19 2014 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 .../0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch       | 4 ++--
 debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch b/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
index 6efca57..89e01db 100644
--- a/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
+++ b/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index c3be736..0c654fd 100644
+index a6493ce..972e278 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
 @@ -6,7 +6,14 @@ define('SABRE_MYSQLPASS','');
@@ -29,6 +29,6 @@ index c3be736..0c654fd 100644
 +$loader->addPrefixes(array(
 +	'Sabre' => __DIR__.'/../lib',
 +));
+ include 'Sabre/TestUtil.php';
  include 'Sabre/DAVServerTest.php';
  
- date_default_timezone_set('GMT');
diff --git a/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch b/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
index cbe3d22..9d0e440 100644
--- a/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
+++ b/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
@@ -8,7 +8,7 @@ Gbp: Topic DEP-8
  1 file changed, 1 deletion(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index 0c654fd..8e3a6bb 100644
+index 972e278..847beea 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
 @@ -12,7 +12,6 @@ $loader = new ClassLoader();
@@ -17,5 +17,5 @@ index 0c654fd..8e3a6bb 100644
  $loader->addPrefixes(array(
 -	'Sabre' => __DIR__.'/../lib',
  ));
+ include 'Sabre/TestUtil.php';
  include 'Sabre/DAVServerTest.php';
- 

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



More information about the Pkg-owncloud-commits mailing list