[Pkg-owncloud-commits] [owncloud] 01/01: Actually install the resources directory

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 736e932631695da242e109e016efedb836e6107c
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 22 18:10:24 2015 -0400

    Actually install the resources directory
---
 debian/install           | 2 +-
 debian/links             | 2 +-
 debian/lintian-overrides | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/install b/debian/install
index 0bfcd87..7b71d8b 100644
--- a/debian/install
+++ b/debian/install
@@ -4,6 +4,7 @@ core		usr/share/owncloud
 lib		usr/share/owncloud
 ocs		usr/share/owncloud
 ocs-provider	usr/share/owncloud
+resources	usr/share/owncloud
 settings	usr/share/owncloud
 themes		var/lib/owncloud
 
@@ -26,7 +27,6 @@ build/jquery-migrate.min.js				usr/share/owncloud/core/vendor/jquery-migrate
 build/util.php						usr/share/owncloud/lib/private
 
 # Files
-resources/config/*.dist.json				etc/owncloud
 config/.htaccess	etc/owncloud
 db_structure.xml	usr/share/owncloud
 index.html		usr/share/owncloud
diff --git a/debian/links b/debian/links
index a6949ae..18d474f 100644
--- a/debian/links
+++ b/debian/links
@@ -9,7 +9,7 @@ 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
+etc/ssl/certs/ca-certificates.crt					usr/share/owncloud/resources/config/ca-bundle.crt
 
 # Link JavaScript files from the locations in dependency packages.
 usr/share/javascript/backbone/backbone.js			usr/share/owncloud/core/vendor/backbone/backbone.js
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 7b11597..d3973d5 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,5 +1,5 @@
 # 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
+package-contains-broken-symlink usr/share/owncloud/resources/config/ca-bundle.crt etc/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