[Pkg-owncloud-commits] [owncloud] 42/44: Drop patch included upstream

[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 4c282c96553f72d3ce9328670d95464d1d8f153f
Author: David Prévot <taffit at debian.org>
Date:   Fri Mar 7 09:19:56 2014 -0300

    Drop patch included upstream
---
 .../0018-Fix-X-EVOLUTION-FILE-AS-escape.patch      | 37 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 38 deletions(-)

diff --git a/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch b/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch
deleted file mode 100644
index ed060ef..0000000
--- a/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 12 Jan 2014 19:23:58 +0000
-Subject: Fix X-EVOLUTION-FILE-AS escape
-
-Evolution defaults to the form "X-EVOLUTION-FILE-AS:Bloggs\, Joe", and
-since Evolution uses this field as the contacts' displayed name, it's
-highly visible when ownCloud turns it into
-"X-EVOLUTION-FILE-AS:Bloggs\\, Joe".
-
-https://github.com/owncloud/contacts/issues/42#issuecomment-28776546
-
-When interacting with Evolution-Data-Server (which I think MeeGo might
-use), the same incorrect escaping applies to X-EVOLUTION-FILE-AS. This
-is a non-standard field, but it's highly visible for Evolution users,
-since it's used as the default displayed name for contacts there.
-
-https://github.com/owncloud/core/issues/2335#issuecomment-32130820
-
-Bug-Debian: http://bugs.debian.org/735112
-Bug: https://github.com/owncloud/contacts/pull/355
-Origin: upstream, https://github.com/owncloud/contacts/commit/16fa2cf80713d383c3705f4dee27c6af05fa3d68
----
- apps/contacts/appinfo/app.php | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
-index 363ebd6..60be9ef 100644
---- a/apps/contacts/appinfo/app.php
-+++ b/apps/contacts/appinfo/app.php
-@@ -15,6 +15,7 @@ use \OC\AppFramework\Core\API;
- \Sabre\VObject\Property::$classMap['TEL']		= '\OC\VObject\StringProperty';
- \Sabre\VObject\Property::$classMap['IMPP']		= '\OC\VObject\StringProperty';
- \Sabre\VObject\Property::$classMap['URL']		= '\OC\VObject\StringProperty';
-+\Sabre\VObject\Property::$classMap['X-EVOLUTION-FILE-AS'] = '\OC\VObject\StringProperty';
- \Sabre\VObject\Property::$classMap['N']			= '\OC\VObject\CompoundProperty';
- \Sabre\VObject\Property::$classMap['ADR']		= '\OC\VObject\CompoundProperty';
- \Sabre\VObject\Property::$classMap['GEO']		= '\OC\VObject\CompoundProperty';
diff --git a/debian/patches/series b/debian/patches/series
index 5d13899..be08744 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,3 @@ path/0014-Adapt-Dropbox-path.patch
 path/0015-Adapt-php-opencloud-path.patch
 path/0016-Adapt-Zend-path.patch
 0017-Disable-Flash-and-Silverlight-plugins.patch
-0018-Fix-X-EVOLUTION-FILE-AS-escape.patch

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