[Pkg-owncloud-commits] [owncloud] 64/83: Refresh patches

[David Prévot]

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

taffit pushed a commit to branch 5.0
in repository owncloud.

commit c8f360f3c9d6c95617b834dbf41fa813fbb411f4
Author: David Prévot <taffit at debian.org>
Date:   Fri Dec 13 22:14:33 2013 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/fix_fancybox.diff          | 14 --------------
 debian/patches/fix_incorrect_escapes.diff | 19 -------------------
 debian/patches/series                     |  2 --
 3 files changed, 35 deletions(-)

diff --git a/debian/patches/fix_fancybox.diff b/debian/patches/fix_fancybox.diff
deleted file mode 100644
index 0250166..0000000
--- a/debian/patches/fix_fancybox.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Adapt FancyBox path
- The Debian package depends on the packaged JavaScript library instead
- of embedding it.
-Author: David Prévot <taffit at debian.org>
-Forwarded: not-needed
-Last-Update: 2013-08-31
---- a/apps/files_imageviewer/appinfo/app.php
-+++ b/apps/files_imageviewer/appinfo/app.php
-@@ -3,4 +3,4 @@
- OCP\Util::addscript( 'files_imageviewer', 'lightbox' );
- OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
- OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
--OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
-+OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox' );
diff --git a/debian/patches/fix_incorrect_escapes.diff b/debian/patches/fix_incorrect_escapes.diff
deleted file mode 100644
index 81204eb..0000000
--- a/debian/patches/fix_incorrect_escapes.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Map N and ORG to CompoundProperty
-
-FN (full name) was incorrectly treated as a structured field.
-
-Author: Thomas Tanghus <thomas at tanghus.net>
-Origin: upstream, https://github.com/owncloud/apps/commit/4f399363620ca0c42bc46571c1f702c997bf79ed
-Bug: https://github.com/owncloud/contacts/issues/42
-Bug-Debian: http://bugs.debian.org/729862
---- a/apps/contacts/appinfo/bootstrap.php
-+++ b/apps/contacts/appinfo/bootstrap.php
-@@ -28,7 +28,7 @@
- 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['FN'] = 'OC\VObject\CompoundProperty';
-+Sabre\VObject\Property::$classMap['N'] = 'OC\VObject\CompoundProperty';
- Sabre\VObject\Property::$classMap['ADR'] = 'OC\VObject\CompoundProperty';
- Sabre\VObject\Property::$classMap['CATEGORIES'] = 'OC\VObject\CompoundProperty';
- Sabre\VObject\Property::$classMap['GEO'] = 'OC\VObject\CompoundProperty';
diff --git a/debian/patches/series b/debian/patches/series
index 1002c85..a6638cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,8 +9,6 @@ fix_crypt_blowfish.diff
 fix_log_path.diff
 fix_symphony.diff
 fix_chosen.diff
-fix_fancybox.diff
 fix_irods.diff
 fix_google-api-php-client.diff
-fix_incorrect_escapes.diff
 fix_apache2.4.diff

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