[Pkg-javascript-commits] [pdf.js] 154/157: Refresh patches

David Prévot taffit at moszumanska.debian.org
Tue Aug 11 06:46:55 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 6e78461d72cdeac38e46c1235eaa2bb20d4fcf68
Author: David Prévot <david at tilapin.org>
Date:   Tue Aug 11 06:24:37 2015 +0200

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-No-embedded-PDF.patch                         | 6 +++---
 debian/patches/0002-Fix-build-versions-in-generated-file.patch    | 6 +++---
 .../0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch | 2 +-
 .../0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch  | 4 ++--
 debian/patches/ownCloud/0005-adjust-close-button-position.patch   | 2 +-
 debian/patches/ownCloud/0006-open-buttons-removed.patch           | 4 ++--
 .../0007-Make-PDF-viewer-working-again-in-public-view.patch       | 4 ++--
 ...008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch | 4 ++--
 debian/patches/ownCloud/0009-URL-encode-needed-values.patch       | 4 ++--
 .../ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch     | 2 +-
 debian/patches/ownCloud/0011-Drop-attachment-feature.patch        | 8 ++++----
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/debian/patches/0001-No-embedded-PDF.patch b/debian/patches/0001-No-embedded-PDF.patch
index 6cd1183..b8e4948 100644
--- a/debian/patches/0001-No-embedded-PDF.patch
+++ b/debian/patches/0001-No-embedded-PDF.patch
@@ -13,10 +13,10 @@ Forwarded: not-needed
  1 file changed, 2 deletions(-)
 
 diff --git a/make.js b/make.js
-index 0c8380c..8ed0d54 100644
+index b35b68e..4512a29 100644
 --- a/make.js
 +++ b/make.js
-@@ -136,7 +136,6 @@ target.generic = function() {
+@@ -137,7 +137,6 @@ target.generic = function() {
        ['LICENSE', GENERIC_DIR],
        ['external/webL10n/l10n.js', GENERIC_DIR + '/web'],
        ['web/compatibility.js', GENERIC_DIR + '/web'],
@@ -24,7 +24,7 @@ index 0c8380c..8ed0d54 100644
        ['external/bcmaps/*', GENERIC_DIR + '/web/cmaps/'],
        ['web/locale', GENERIC_DIR + '/web']
      ],
-@@ -649,7 +648,6 @@ target.minified = function() {
+@@ -661,7 +660,6 @@ target.minified = function() {
      defines: defines,
      copy: [
        [COMMON_WEB_FILES, MINIFIED_DIR + '/web'],
diff --git a/debian/patches/0002-Fix-build-versions-in-generated-file.patch b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
index 0195423..208cb20 100644
--- a/debian/patches/0002-Fix-build-versions-in-generated-file.patch
+++ b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
@@ -13,10 +13,10 @@ Forwarded: not-needed
  1 file changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/make.js b/make.js
-index 8ed0d54..417f51d 100644
+index 4512a29..ab8376e 100644
 --- a/make.js
 +++ b/make.js
-@@ -492,8 +492,7 @@ target.bundle = function(args) {
+@@ -493,8 +493,7 @@ target.bundle = function(args) {
  
      var bundleContent = cat(SRC_FILES),
          bundleVersion = VERSION,
@@ -26,7 +26,7 @@ index 8ed0d54..417f51d 100644
  
      crlfchecker.checkIfCrlfIsPresent(SRC_FILES);
  
-@@ -723,14 +722,7 @@ target.buildnumber = function() {
+@@ -735,14 +734,7 @@ target.buildnumber = function() {
    echo();
    echo('### Getting extension build number');
  
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 491fa8a..2e7d8f0 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
@@ -2558,7 +2558,7 @@ index 0000000..f0cd236
 +  return writePermission;
 +}
 diff --git a/make.js b/make.js
-index fba367e..7ebf854 100644
+index ad145eb..07bb5ed 100644
 --- a/make.js
 +++ b/make.js
 @@ -20,14 +20,7 @@
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 6f10111..bf2c06c 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 32ed428..2078ea4 100644
+index cbeda49..356018a 100644
 --- a/web/viewer.js
 +++ b/web/viewer.js
-@@ -1514,7 +1514,8 @@ function webViewerInitialized() {
+@@ -1486,7 +1486,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 8bd2a81..01a083b 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 4602351..b17681b 100644
+index 04bbc1e..4656312 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 a7fb254..2f09d2b 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 2078ea4..434a3d4 100644
+index 356018a..4d9b80d 100644
 --- a/web/viewer.js
 +++ b/web/viewer.js
-@@ -1477,9 +1477,6 @@ function webViewerInitialized() {
+@@ -1449,9 +1449,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 b71bf01..028fca7 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 434a3d4..c530d03 100644
+index 4d9b80d..b361f9d 100644
 --- a/web/viewer.js
 +++ b/web/viewer.js
-@@ -1510,9 +1510,13 @@ function webViewerInitialized() {
+@@ -1482,9 +1482,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 df90f80..a540a60 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 c530d03..e801b13 100644
+index b361f9d..cd429f5 100644
 --- a/web/viewer.js
 +++ b/web/viewer.js
-@@ -1513,10 +1513,10 @@ function webViewerInitialized() {
+@@ -1485,10 +1485,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 fa4c519..2e67687 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 e801b13..f046ff4 100644
+index cd429f5..b0f8c39 100644
 --- a/web/viewer.js
 +++ b/web/viewer.js
-@@ -1512,11 +1512,11 @@ function webViewerInitialized() {
+@@ -1484,11 +1484,11 @@ function webViewerInitialized() {
  
    // owncould customization to load file
    if (file && dir !== '') {
diff --git a/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch b/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
index 9b93c95..bca0415 100644
--- a/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
+++ b/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/make.js b/make.js
-index 417f51d..fba367e 100644
+index ab8376e..ad145eb 100644
 --- a/make.js
 +++ b/make.js
 @@ -41,7 +41,7 @@ var BUILD_NUMBER,
diff --git a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
index 9b816f4..4637092 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 f046ff4..5a72218 100644
+index b0f8c39..3a0db64 100644
 --- a/web/viewer.js
 +++ b/web/viewer.js
-@@ -1051,7 +1051,6 @@ var PDFViewerApplication = {
+@@ -1027,7 +1027,6 @@ var PDFViewerApplication = {
  
          thumbsButton.classList.add('toggled');
          outlineButton.classList.remove('toggled');
@@ -19,7 +19,7 @@ index f046ff4..5a72218 100644
          thumbsView.classList.remove('hidden');
          outlineView.classList.add('hidden');
          attachmentsView.classList.add('hidden');
-@@ -1066,7 +1065,6 @@ var PDFViewerApplication = {
+@@ -1042,7 +1041,6 @@ var PDFViewerApplication = {
        case 'outline':
          thumbsButton.classList.remove('toggled');
          outlineButton.classList.add('toggled');
@@ -27,7 +27,7 @@ index f046ff4..5a72218 100644
          thumbsView.classList.add('hidden');
          outlineView.classList.remove('hidden');
          attachmentsView.classList.add('hidden');
-@@ -1431,11 +1429,6 @@ function webViewerInitialized() {
+@@ -1401,11 +1399,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