[Pkg-owncloud-commits] [owncloud] 04/07: Adapt to embedded Google APIs Client Library

[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 dfd3827a63c44eb00e03694593b76729f4cc1197
Author: David Prévot <taffit at debian.org>
Date:   Wed Sep 4 17:04:52 2013 -0400

    Adapt to embedded Google APIs Client Library
---
 debian/copyright |   13 +++++++++++--
 debian/rules     |    3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index f3326a2..55725d5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -193,7 +193,12 @@ Copyright: 2010, Alix Axel
 License: Expat
 Comment: Yet unidentified contributions from phunction PHP framework.
 
+Files: apps/files_external/3rdparty/google-api-php-client/*
+Copyright: 2008, 2010-2012, Google Inc.
+License: Apache-2.0
+
 Files: 3rdparty/aws-sdk/lib/requestcore/cacert.pem
+       apps/files_external/3rdparty/google-api-php-client/src/io/cacerts.pem
 Copyright: 1994-2000 the Initial Developer
 License: MPL-1.1 or GPL-2+ or LGPL-2.1+
 
@@ -422,8 +427,8 @@ Files: apps/files/js/jquery-visibility.js
 Copyright: 2012, Mathias Bynens
 License: Expat or GPL-2
 
-Files: apps/files_external/3rdparty/phpseclib/*
-Copyright: 2006-2012, Jim Wigginton <terrafrost at php.net>
+Files: apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php
+Copyright: 2010, Kevin M Burns Jr <http://kevburnsjr.com/>
 License: Expat
 
 Files: apps/files_external/3rdparty/irodsphp/*
@@ -460,6 +465,10 @@ Files: apps/files_external/3rdparty/irodsphp/prods/doc_config.ini
 Copyright: 2002, Greg Beaver <cellog at php.net>
 License: LGPL-2.1+
 
+Files: apps/files_external/3rdparty/phpseclib/*
+Copyright: 2006-2012, Jim Wigginton <terrafrost at php.net>
+License: Expat
+
 Files: apps/files_imageviewer/js/jquery.fancybox-1.3.4*js
 Copyright: 2008-2010, Janis Skarnelis
 License: Expat or GPL-2
diff --git a/debian/rules b/debian/rules
index ea3e7f7..6e0b232 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Google/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
+	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client/LICENSE
+	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client/NOTICE
 	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/prods/src/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/LICENSE
@@ -37,6 +39,7 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/Changelog
 	rm debian/owncloud/usr/share/owncloud/apps/files_antivirus/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/files_encryption/appinfo/spec.txt
+	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client/README
 	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/prods/doc_config.ini
 	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/prods/release_notes.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/release_notes.txt

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