[Pkg-owncloud-commits] [owncloud] 01/02: Adapt to recent pdf.js

[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 472bd464737e20c3f53991ffced2f82653eda274
Author: David Prévot <taffit at debian.org>
Date:   Sun Jul 27 16:33:17 2014 -0400

    Adapt to recent pdf.js
---
 debian/control           | 2 +-
 debian/install           | 1 +
 debian/links             | 2 +-
 debian/lintian-overrides | 2 +-
 debian/rules             | 1 +
 debian/viewer.css        | 5 +++++
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index f58fbfc..235522a 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: apache2 | httpd,
          libjs-jquery-minicolors (<< 2~),
          libjs-jquery-mousewheel,
          libjs-jquery-timepicker,
-         libjs-pdf,
+         libjs-pdf (>= 1.0.473-1~),
          libphp-phpmailer,
          owncloud-doc,
          php-assetic,
diff --git a/debian/install b/debian/install
index 0c2dc38..24a7636 100644
--- a/debian/install
+++ b/debian/install
@@ -16,6 +16,7 @@ themes		var/lib/owncloud
 3rdparty/phpass						usr/share/owncloud/3rdparty
 3rdparty/zxcvbn/js/zxcvbn.js				usr/share/owncloud/3rdparty/zxcvbn/js
 debian/autoload.php					usr/share/owncloud/3rdparty
+debian/viewer.css					usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs
 
 # Files
 db_structure.xml	usr/share/owncloud
diff --git a/debian/links b/debian/links
index 3075e25..206b6f3 100644
--- a/debian/links
+++ b/debian/links
@@ -24,7 +24,7 @@ usr/share/javascript/pdf/web/l10n.js		usr/share/owncloud/apps/files_pdfviewer/3r
 usr/share/javascript/pdf/web/locale		usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale
 usr/share/javascript/pdf/build/pdf.js		usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/pdf.js
 usr/share/javascript/pdf/build/pdf.worker.js	usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/pdf.worker.js
-usr/share/javascript/pdf/web/viewer.css		usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.css
+usr/share/javascript/pdf/web/viewer.css		usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.orig.css
 
 # Use fonts from font-awesome, fonts-sil-gentium-basic, fonts-liberation, fonts-linuxlibertine, fonts-lohit-deva, and fonts-wqy-microhei
 usr/share/fonts-font-awesome						usr/share/owncloud/3rdparty/fontawesome
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index f69fb45..1b47691 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -26,6 +26,6 @@ package-contains-broken-symlink usr/share/owncloud/apps/documents/js/3rdparty/re
 # These symlinks point to a file and directories provided by libjs-pdf, which is a dependency.
 package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images ../../../../../javascript/pdf/web/images
 package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale ../../../../../javascript/pdf/web/locale
-package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.css ../../../../../javascript/pdf/web/viewer.css
+package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.orig.css ../../../../../javascript/pdf/web/viewer.css
 # 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
diff --git a/debian/rules b/debian/rules
index 3c083bc..064790b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,6 +101,7 @@ override_dh_install:
 	rm -r debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/resources
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale
+	rm    debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.js
 
 	# Remove the Updater app since upgrade must be made via the package
 	rm -r debian/owncloud/usr/share/owncloud/apps/updater
diff --git a/debian/viewer.css b/debian/viewer.css
new file mode 100644
index 0000000..6ae37b3
--- /dev/null
+++ b/debian/viewer.css
@@ -0,0 +1,5 @@
+ at import url("viewer.orig.css");
+html[dir='ltr'] #toolbarViewerRight,
+html[dir='rtl'] #toolbarViewerLeft {
+  right: 25px;
+}

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