[Pkg-owncloud-commits] [owncloud] 04/07: Use authorized certificates from ca-certificates

[David Prévot]

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

taffit pushed a commit to branch wip/stable8
in repository owncloud.

commit 9aafc079aeeb938afb13c6970d48e33264b6fc9a
Author: David Prévot <taffit at debian.org>
Date:   Thu Apr 16 22:51:17 2015 -0400

    Use authorized certificates from ca-certificates
---
 debian/control           | 3 ++-
 debian/copyright         | 1 +
 debian/links             | 3 +++
 debian/lintian-overrides | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 7a4c19f..39e6a0b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud.git
 
 Package: owncloud
 Architecture: all
-Depends: libjs-handlebars,
+Depends: ca-certificates,
+         libjs-handlebars,
          libjs-jcrop,
          libjs-jquery-mousewheel,
          libjs-mediaelement,
diff --git a/debian/copyright b/debian/copyright
index 4f00df2..fc32d5e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -233,6 +233,7 @@ Files: 3rdparty/guzzle/http/Guzzle/Http/Resources/cacert.pem
        apps/files_pdfviewer/vendor/pdfjs/web/locale/rm/viewer.properties
        apps/files_pdfviewer/vendor/pdfjs/web/locale/ru/viewer.properties
        apps/files_pdfviewer/vendor/pdfjs/web/locale/sq/viewer.properties
+       config/ca-bundle.crt
 Copyright: 2012, Mozilla Foundation
 License: MPL-2.0
 
diff --git a/debian/links b/debian/links
index a08eb6d..c659a20 100644
--- a/debian/links
+++ b/debian/links
@@ -8,6 +8,9 @@ var/lib/owncloud/themes	usr/share/owncloud/themes
 etc/owncloud		usr/share/owncloud/config
 etc/owncloud/htaccess	usr/share/owncloud/.htaccess
 
+# Use authorized certificates from ca-certificates
+etc/ssl/certs/ca-certificates.crt					etc/owncloud/ca-bundle.crt
+
 # Link JavaScript files from the locations in dependency packages.
 usr/share/javascript/handlebars/handlebars.js			usr/share/owncloud/core/vendor/handlebars/handlebars.js
 usr/share/javascript/jcrop					usr/share/owncloud/core/vendor/jcrop
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index bb3c021..7cd6238 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -2,6 +2,8 @@
 non-standard-dir-perm var/lib/owncloud/assets/ 2770 != 0755
 non-standard-dir-perm var/lib/owncloud/data/ 2770 != 0755
 non-standard-dir-perm var/lib/owncloud/backup/ 2770 != 0755
+# This symlink points to a file provided by ca-certificates, which is a dependency
+package-contains-broken-symlink etc/owncloud/ca-bundle.crt ../ssl/certs/ca-certificates.crt
 # This symlink points to a file provided by libjs-jcrop, which is a dependency.
 package-contains-broken-symlink usr/share/owncloud/core/vendor/jcrop ../../../javascript/jcrop
 # This symlink points to a directory provided by libjs-pdf, which is a dependency.

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