[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.7_rc1+dfsg-1-1-g08b6667

[David Prévot]

The following commit has been merged in the master branch:
commit 08b6667d50d3009c46c79f9d2cc1061424919da1
Author: David Prévot <taffit at debian.org>
Date:   Mon Jun 3 19:56:04 2013 -0400

    Adapt Crypt_Blowfish path

diff --git a/debian/patches/fix_crypt_blowfish.diff b/debian/patches/fix_crypt_blowfish.diff
new file mode 100644
index 0000000..cfb94c4
--- /dev/null
+++ b/debian/patches/fix_crypt_blowfish.diff
@@ -0,0 +1,23 @@
+Description: Adapt Crypt_Blowfish 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-06-03
+--- a/apps/files_encryption/lib/crypt.php
++++ b/apps/files_encryption/lib/crypt.php
+@@ -26,7 +26,7 @@
+ namespace OCA\Encryption;
+ 
+ //require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
+-require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
++require_once realpath(dirname(__FILE__) . '/Crypt/Blowfish.php');
+ 
+ /**
+  * Class for common cryptography functionality
+@@ -661,4 +661,4 @@
+ 
+ 	}
+ 
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 7b3c532..b883820 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix_mediawiki.diff
 fix_upgrade.diff
 fix_displayed_version.diff
 fix_aws-sdk.diff
+fix_crypt_blowfish.diff

-- 
owncloud.git