[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-rc-65-g321b4e4

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 3a4b66b3eb647d6aa08762958da2ba83b6247c2f
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed May 16 23:56:16 2012 +0200

    Added debian/patches/03_fix_phpmailer.diff to fix the require of phpmailer

diff --git a/debian/TODO b/debian/TODO
index 53fff53..e9c7ed4 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -9,8 +9,6 @@ ownCloud packaging TODO list
   because this is risky. Bad code can be injected.
 * Check whether php-getid3 can be used as a depend, remove the source and
   integrate with it (the package has a weird installation path).
-* Check whether the integration with libphp-phpmailer works; there is
-  probably a load path issue.
 
 Low priority/later
 ------------------
diff --git a/debian/changelog b/debian/changelog
index ece0f99..212c087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ owncloud (4.0.0~rc-1) UNRELEASED; urgency=low
       04_adding_jquery_infieldlabel_js.diff,
       05_adding_jquery_fancyboxbox.diff,
       06_adding_jquery.mousewheel.diff as this is handled upstream now.
+    - Added 03_fix_phpmailer.diff to fix the phpmailer require.
   * debian/README.Debian: added to explain the database setup and virtual
     host stuff.
   * debian/README.source: added to explain the state of the source and how
diff --git a/debian/patches/03_fix_phpmailer.diff b/debian/patches/03_fix_phpmailer.diff
new file mode 100644
index 0000000..1e59c65
--- /dev/null
+++ b/debian/patches/03_fix_phpmailer.diff
@@ -0,0 +1,17 @@
+Description: patch to class.phpmailer.php is different
+  We use class.phpmailer.php from the libphp-phpmailer Debian package.
+  The path is different and must be changed.
+Author: Paul van Tilburg <paulvt at debian.org>
+Forwarded: not-needed
+
+--- a/lib/mail.php
++++ b/lib/mail.php
+@@ -12,7 +12,7 @@
+  * A class to handle mail sending.
+  */
+ 
+-require_once('class.phpmailer.php');
++require_once('libphp-phpmailer/class.phpmailer.php');
+ 
+ class OC_Mail {
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 741856e..ed0dbed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix_data_path.diff
 02_fix_crypt.diff
+03_fix_phpmailer.diff

-- 
owncloud.git