[Pkg-javascript-commits] [pdf.js] 104/106: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sat Jun 20 21:35:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit 9a1a5e87ebdbc956c94ad86e400eb04fa1d51b5e
Author: David Prévot <david at tilapin.org>
Date: Sat Jun 20 15:25:12 2015 -0400
Refresh patches
Git-Dch: Ignore
---
...move-ShellJS-copy-and-use-the-NPM-version.patch | 29 +---------------------
...loud-specific-loading-of-the-pdf-document.patch | 4 +--
.../0005-adjust-close-button-position.patch | 2 +-
.../ownCloud/0006-open-buttons-removed.patch | 4 +--
...e-PDF-viewer-working-again-in-public-view.patch | 4 +--
...ead-of-encode-because-we-need-to-pass-HTM.patch | 4 +--
.../ownCloud/0009-URL-encode-needed-values.patch | 4 +--
.../ownCloud/0011-Drop-attachment-feature.patch | 8 +++---
8 files changed, 16 insertions(+), 43 deletions(-)
diff --git a/debian/patches/0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch b/debian/patches/0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch
index d9a1cda..491fa8a 100644
--- a/debian/patches/0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch
+++ b/debian/patches/0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch
@@ -5,7 +5,6 @@ Subject: Revert "Remove ShellJS copy and use the NPM version"
Origin: upstream, https://github.com/mozilla/pdf.js/commit/70b6eb09a88d62cf13658f36f19bdda775bec085
Bug-Debian: https://bugs.debian.org/781490
---
- external/builder/builder.js | 2 +-
external/shelljs/LICENSE | 26 +
external/shelljs/README.md | 512 +++++++++++
external/shelljs/global.js | 3 +
@@ -13,8 +12,7 @@ Bug-Debian: https://bugs.debian.org/781490
external/shelljs/package.json | 32 +
external/shelljs/shell.js | 1880 +++++++++++++++++++++++++++++++++++++++++
make.js | 9 +-
- package.json | 1 -
- 9 files changed, 2503 insertions(+), 10 deletions(-)
+ 7 files changed, 2502 insertions(+), 8 deletions(-)
create mode 100644 external/shelljs/LICENSE
create mode 100644 external/shelljs/README.md
create mode 100644 external/shelljs/global.js
@@ -22,19 +20,6 @@ Bug-Debian: https://bugs.debian.org/781490
create mode 100644 external/shelljs/package.json
create mode 100644 external/shelljs/shell.js
-diff --git a/external/builder/builder.js b/external/builder/builder.js
-index c0d3da2..637e35d 100644
---- a/external/builder/builder.js
-+++ b/external/builder/builder.js
-@@ -5,7 +5,7 @@
-
- 'use strict';
-
--require('shelljs/make');
-+require('../shelljs/make');
- var fs = require('fs'),
- path = require('path'),
- vm = require('vm');
diff --git a/external/shelljs/LICENSE b/external/shelljs/LICENSE
new file mode 100644
index 0000000..1b35ee9
@@ -2592,15 +2577,3 @@ index fba367e..7ebf854 100644
var builder = require('./external/builder/builder.js');
var crlfchecker = require('./external/crlfchecker/crlfchecker.js');
var path = require('path');
-diff --git a/package.json b/package.json
-index f473a81..8732fe5 100644
---- a/package.json
-+++ b/package.json
-@@ -7,7 +7,6 @@
- "wintersmith": "~2.0.0",
- "moment": "~2.3.0",
- "underscore": "~1.4.0",
-- "shelljs": "~0.4.0",
- "typogr": "~0.5.0",
- "yargs": "~1.2.1"
- },
diff --git a/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch b/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
index 62eec6e..6f10111 100644
--- a/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
+++ b/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
@@ -8,10 +8,10 @@ origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/f58e37a8ffadf
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 6a6389f..40ea197 100644
+index 32ed428..2078ea4 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1658,7 +1658,8 @@ function webViewerInitialized() {
+@@ -1514,7 +1514,8 @@ function webViewerInitialized() {
}
if (file) {
diff --git a/debian/patches/ownCloud/0005-adjust-close-button-position.patch b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
index 1089e03..8bd2a81 100644
--- a/debian/patches/ownCloud/0005-adjust-close-button-position.patch
+++ b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
@@ -8,7 +8,7 @@ origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/f7c625773b621
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/viewer.css b/web/viewer.css
-index c248633..394eb88 100644
+index 4602351..b17681b 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -503,7 +503,7 @@ html[dir='ltr'] #toolbarViewerRight,
diff --git a/debian/patches/ownCloud/0006-open-buttons-removed.patch b/debian/patches/ownCloud/0006-open-buttons-removed.patch
index c4afad8..a7fb254 100644
--- a/debian/patches/ownCloud/0006-open-buttons-removed.patch
+++ b/debian/patches/ownCloud/0006-open-buttons-removed.patch
@@ -8,10 +8,10 @@ origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/71ab97f9b074c
1 file changed, 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 40ea197..a248b92 100644
+index 2078ea4..434a3d4 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1621,9 +1621,6 @@ function webViewerInitialized() {
+@@ -1477,9 +1477,6 @@ function webViewerInitialized() {
document.getElementById('presentationMode').addEventListener('click',
SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
diff --git a/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch b/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
index 49da3b3..b71bf01 100644
--- a/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
+++ b/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
@@ -14,10 +14,10 @@ origin: vendor,
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index a248b92..629d3fc 100644
+index 434a3d4..c530d03 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1654,9 +1654,13 @@ function webViewerInitialized() {
+@@ -1510,9 +1510,13 @@ function webViewerInitialized() {
return;
}
diff --git a/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch b/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
index a4c29a9..df90f80 100644
--- a/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
+++ b/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
@@ -8,10 +8,10 @@ origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/9f1fcd2d1a18e
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 629d3fc..f0c819f 100644
+index c530d03..e801b13 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1657,10 +1657,10 @@ function webViewerInitialized() {
+@@ -1513,10 +1513,10 @@ function webViewerInitialized() {
// owncould customization to load file
if (file && dir !== '') {
// Logged in
diff --git a/debian/patches/ownCloud/0009-URL-encode-needed-values.patch b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
index 91690c1..fa4c519 100644
--- a/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
+++ b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
@@ -21,10 +21,10 @@ origin: vendor,
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index f0c819f..de75134 100644
+index e801b13..f046ff4 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1656,11 +1656,11 @@ function webViewerInitialized() {
+@@ -1512,11 +1512,11 @@ function webViewerInitialized() {
// owncould customization to load file
if (file && dir !== '') {
diff --git a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
index 67e58a6..9b816f4 100644
--- a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
+++ b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
@@ -8,10 +8,10 @@ ownCloud currently seems to choke on it.
1 file changed, 7 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index de75134..3c1839a 100644
+index f046ff4..5a72218 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1229,7 +1229,6 @@ var PDFViewerApplication = {
+@@ -1051,7 +1051,6 @@ var PDFViewerApplication = {
thumbsButton.classList.add('toggled');
outlineButton.classList.remove('toggled');
@@ -19,7 +19,7 @@ index de75134..3c1839a 100644
thumbsView.classList.remove('hidden');
outlineView.classList.add('hidden');
attachmentsView.classList.add('hidden');
-@@ -1244,7 +1243,6 @@ var PDFViewerApplication = {
+@@ -1066,7 +1065,6 @@ var PDFViewerApplication = {
case 'outline':
thumbsButton.classList.remove('toggled');
outlineButton.classList.add('toggled');
@@ -27,7 +27,7 @@ index de75134..3c1839a 100644
thumbsView.classList.add('hidden');
outlineView.classList.remove('hidden');
attachmentsView.classList.add('hidden');
-@@ -1575,11 +1573,6 @@ function webViewerInitialized() {
+@@ -1431,11 +1429,6 @@ function webViewerInitialized() {
PDFViewerApplication.switchSidebarView('outline');
});
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git
More information about the Pkg-javascript-commits
mailing list