[Pkg-owncloud-commits] [owncloud] 105/107: Revert "Adapt to ownCloudUserManual.pdf removal"

[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 64a3a85b7420cbfa7285946d9acced98e18bc285
Author: David Prévot <taffit at debian.org>
Date:   Thu Dec 17 15:26:06 2015 -0400

    Revert "Adapt to ownCloudUserManual.pdf removal"
    
    This reverts commit 9db9ce3bc0362e12ca8928475e5e7fa61dc9e200.
---
 debian/copyright         | 1 +
 debian/links             | 3 +++
 debian/lintian-overrides | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index f376e8d..0f9801a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,7 @@ Files-Excluded: apps/files_pdfviewer/vendor/pdfjs/web/cmaps/*.bcmap
                 core/doc/user/_images/osx_webdav1.png
                 core/img/actions/caret.png
                 core/img/actions/logout.png
+                core/skeleton/ownCloudUserManual.pdf
                 core/skeleton/Photos
 
 Files: *
diff --git a/debian/links b/debian/links
index 18d474f..7177428 100644
--- a/debian/links
+++ b/debian/links
@@ -28,3 +28,6 @@ usr/share/javascript/mediaelement/controls.svg				usr/share/owncloud/apps/files_
 usr/share/javascript/mediaelement/loading.gif				usr/share/owncloud/apps/files_videoviewer/css/loading.gif
 usr/share/javascript/mediaelement/mediaelement-and-player.js		usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.js
 usr/share/javascript/mediaelement/mediaelement-and-player.min.js	usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js
+
+# Use the PDF from owncloud-doc
+usr/share/owncloud/core/doc/user/ownCloudUserManual.pdf			usr/share/owncloud/core/skeleton/ownCloudUserManual.pdf
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index d3973d5..39678e9 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -4,6 +4,8 @@ package-contains-broken-symlink usr/share/owncloud/resources/config/ca-bundle.cr
 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.
 package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/vendor/pdfjs ../../../../javascript/pdf
+# This symlink points to a file provided by owncloud-doc, which is a dependency.
+package-contains-broken-symlink usr/share/owncloud/core/skeleton/ownCloudUserManual.pdf ../doc/user/ownCloudUserManual.pdf
 # These symlinks point to files provided by libjs-mediaelement, which is a dependency.
 package-contains-broken-symlink usr/share/owncloud/apps/files_videoviewer/css/background.png ../../../../javascript/mediaelement/background.png
 package-contains-broken-symlink usr/share/owncloud/apps/files_videoviewer/css/bigplay.png ../../../../javascript/mediaelement/bigplay.png

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