[Pkg-javascript-commits] [pdf.js] 242/246: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sun Sep 7 15:36:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit 5f646a96d0eda66f9802ba0f8163ce66efa8f77b
Author: David Prévot <taffit at debian.org>
Date: Sun Sep 7 09:58:11 2014 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-No-embedded-PDF.patch | 4 ++--
.../0002-Fix-build-versions-in-generated-file.patch | 4 ++--
...adobe-CMaps.patch => 0003-Add-adobe-CMaps.patch} | 0
debian/patches/0003-Don-t-fetch-external-data.patch | 21 ---------------------
...loud-specific-loading-of-the-pdf-document.patch} | 4 ++--
...atch => 0005-adjust-close-button-position.patch} | 2 +-
...emoved.patch => 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 ++--
...es.patch => 0009-URL-encode-needed-values.patch} | 4 ++--
...010-Build-ownCloud-specific-version-in-oc.patch} | 2 +-
...ure.patch => 0011-Drop-attachment-feature.patch} | 8 ++++----
debian/patches/series | 3 +--
13 files changed, 21 insertions(+), 43 deletions(-)
diff --git a/debian/patches/0001-No-embedded-PDF.patch b/debian/patches/0001-No-embedded-PDF.patch
index eb7d96f..e663a62 100644
--- a/debian/patches/0001-No-embedded-PDF.patch
+++ b/debian/patches/0001-No-embedded-PDF.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
1 file changed, 2 deletions(-)
diff --git a/make.js b/make.js
-index 7b5c544..ece6a55 100644
+index 55945af..8494a21 100644
--- a/make.js
+++ b/make.js
@@ -122,7 +122,6 @@ target.generic = function() {
@@ -24,7 +24,7 @@ index 7b5c544..ece6a55 100644
['external/bcmaps/*', GENERIC_DIR + '/web/cmaps/'],
['web/locale', GENERIC_DIR + '/web']
],
-@@ -492,7 +491,6 @@ target.minified = function() {
+@@ -493,7 +492,6 @@ target.minified = function() {
copy: [
[COMMON_WEB_FILES, MINIFIED_DIR + '/web'],
['web/viewer.css', 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 5a11a7f..da3e60b 100644
--- a/debian/patches/0002-Fix-build-versions-in-generated-file.patch
+++ b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/make.js b/make.js
-index ece6a55..6f616aa 100644
+index 8494a21..ecb0bcc 100644
--- a/make.js
+++ b/make.js
@@ -344,8 +344,7 @@ target.bundle = function(args) {
@@ -26,7 +26,7 @@ index ece6a55..6f616aa 100644
crlfchecker.checkIfCrlfIsPresent(SRC_FILES);
-@@ -560,14 +559,7 @@ target.buildnumber = function() {
+@@ -561,14 +560,7 @@ target.buildnumber = function() {
echo();
echo('### Getting extension build number');
diff --git a/debian/patches/0004-Add-adobe-CMaps.patch b/debian/patches/0003-Add-adobe-CMaps.patch
similarity index 100%
rename from debian/patches/0004-Add-adobe-CMaps.patch
rename to debian/patches/0003-Add-adobe-CMaps.patch
diff --git a/debian/patches/0003-Don-t-fetch-external-data.patch b/debian/patches/0003-Don-t-fetch-external-data.patch
deleted file mode 100644
index 21119ca..0000000
--- a/debian/patches/0003-Don-t-fetch-external-data.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Fri, 18 Apr 2014 15:04:30 -0400
-Subject: =?utf-8?q?Don=E2=80=99t_fetch_external_data?=
-
----
- examples/text-selection/index.html | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/text-selection/index.html b/examples/text-selection/index.html
-index be2921f..d2155fa 100644
---- a/examples/text-selection/index.html
-+++ b/examples/text-selection/index.html
-@@ -2,7 +2,7 @@
- <head>
- <title>Minimal pdf.js text-selection demo</title>
- <link href="css/minimal.css" rel="stylesheet" media="screen" />
-- <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
-+ <script src="js/jquery.min.js"></script>
-
- <!-- you will need to run "node make generic" first before you can use this -->
- <script src="../../build/generic/build/pdf.js"></script>
diff --git a/debian/patches/ownCloud/0005-fix-ownCloud-specific-loading-of-the-pdf-document.patch b/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
similarity index 89%
rename from debian/patches/ownCloud/0005-fix-ownCloud-specific-loading-of-the-pdf-document.patch
rename to debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
index a3fee16..d2fcfd0 100644
--- a/debian/patches/ownCloud/0005-fix-ownCloud-specific-loading-of-the-pdf-document.patch
+++ b/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
@@ -9,10 +9,10 @@ Gbp: Topic ownCloud
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 0300ce2..e49202d 100644
+index 4a4282e..8f06580 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1953,7 +1953,8 @@ function webViewerInitialized() {
+@@ -1987,7 +1987,8 @@ function webViewerInitialized() {
//#if !B2G && !CHROME
if (file) {
diff --git a/debian/patches/ownCloud/0006-adjust-close-button-position.patch b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
similarity index 95%
rename from debian/patches/ownCloud/0006-adjust-close-button-position.patch
rename to debian/patches/ownCloud/0005-adjust-close-button-position.patch
index c6ec133..2c5e04e 100644
--- a/debian/patches/ownCloud/0006-adjust-close-button-position.patch
+++ b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
@@ -9,7 +9,7 @@ Gbp: Topic ownCloud
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/viewer.css b/web/viewer.css
-index fff43e5..1ec65c1 100644
+index c7dce03..a04fbc7 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -508,7 +508,7 @@ html[dir='ltr'] #toolbarViewerRight,
diff --git a/debian/patches/ownCloud/0007-open-buttons-removed.patch b/debian/patches/ownCloud/0006-open-buttons-removed.patch
similarity index 90%
rename from debian/patches/ownCloud/0007-open-buttons-removed.patch
rename to debian/patches/ownCloud/0006-open-buttons-removed.patch
index 884eddc..49ed5b8 100644
--- a/debian/patches/ownCloud/0007-open-buttons-removed.patch
+++ b/debian/patches/ownCloud/0006-open-buttons-removed.patch
@@ -9,10 +9,10 @@ Gbp: Topic ownCloud
1 file changed, 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index e49202d..95f7198 100644
+index 8f06580..8efe60f 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1936,9 +1936,6 @@ function webViewerInitialized() {
+@@ -1948,9 +1948,6 @@ function webViewerInitialized() {
document.getElementById('presentationMode').addEventListener('click',
SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
diff --git a/debian/patches/ownCloud/0008-Make-PDF-viewer-working-again-in-public-view.patch b/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
similarity index 93%
rename from debian/patches/ownCloud/0008-Make-PDF-viewer-working-again-in-public-view.patch
rename to debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
index 76825bc..6a19f51 100644
--- a/debian/patches/ownCloud/0008-Make-PDF-viewer-working-again-in-public-view.patch
+++ b/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
@@ -15,10 +15,10 @@ Gbp: Topic ownCloud
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 95f7198..0400e54 100644
+index 8efe60f..d40606d 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1949,9 +1949,13 @@ function webViewerInitialized() {
+@@ -1983,9 +1983,13 @@ function webViewerInitialized() {
//#endif
//#if !B2G && !CHROME
diff --git a/debian/patches/ownCloud/0009-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
similarity index 92%
rename from debian/patches/ownCloud/0009-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
rename to debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
index ba07b55..ff896c6 100644
--- a/debian/patches/ownCloud/0009-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
@@ -9,10 +9,10 @@ Gbp: Topic ownCloud
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 0400e54..8ada75c 100644
+index d40606d..bf9a6fe 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1952,10 +1952,10 @@ function webViewerInitialized() {
+@@ -1986,10 +1986,10 @@ function webViewerInitialized() {
// owncould customization to load file
if (file && dir !== '') {
// Logged in
diff --git a/debian/patches/ownCloud/0010-URL-encode-needed-values.patch b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
similarity index 95%
rename from debian/patches/ownCloud/0010-URL-encode-needed-values.patch
rename to debian/patches/ownCloud/0009-URL-encode-needed-values.patch
index 4cb1c2d..864f1f0 100644
--- a/debian/patches/ownCloud/0010-URL-encode-needed-values.patch
+++ b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
@@ -22,10 +22,10 @@ Gbp: Topic ownCloud
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 8ada75c..78088ec 100644
+index bf9a6fe..8a6754f 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1951,11 +1951,11 @@ function webViewerInitialized() {
+@@ -1985,11 +1985,11 @@ function webViewerInitialized() {
//#if !B2G && !CHROME
// owncould customization to load file
if (file && dir !== '') {
diff --git a/debian/patches/ownCloud/0011-Build-ownCloud-specific-version-in-oc.patch b/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
similarity index 95%
rename from debian/patches/ownCloud/0011-Build-ownCloud-specific-version-in-oc.patch
rename to debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
index 1e36b26..574e8ff 100644
--- a/debian/patches/ownCloud/0011-Build-ownCloud-specific-version-in-oc.patch
+++ b/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
@@ -9,7 +9,7 @@ Gbp: Topic ownCloud
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.js b/make.js
-index 6f616aa..fa012bd 100644
+index ecb0bcc..5c59a0d 100644
--- a/make.js
+++ b/make.js
@@ -34,7 +34,7 @@ var BUILD_NUMBER,
diff --git a/debian/patches/ownCloud/0012-Drop-attachment-feature.patch b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
similarity index 88%
rename from debian/patches/ownCloud/0012-Drop-attachment-feature.patch
rename to debian/patches/ownCloud/0011-Drop-attachment-feature.patch
index 6c030fa..eb460e4 100644
--- a/debian/patches/ownCloud/0012-Drop-attachment-feature.patch
+++ b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
@@ -9,10 +9,10 @@ Gbp: Topic ownCloud
1 file changed, 7 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 78088ec..2d2eccc 100644
+index 8a6754f..6a22e22 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1424,7 +1424,6 @@ var PDFView = {
+@@ -1436,7 +1436,6 @@ var PDFView = {
thumbsButton.classList.add('toggled');
outlineButton.classList.remove('toggled');
@@ -20,7 +20,7 @@ index 78088ec..2d2eccc 100644
thumbsView.classList.remove('hidden');
outlineView.classList.add('hidden');
attachmentsView.classList.add('hidden');
-@@ -1442,7 +1441,6 @@ var PDFView = {
+@@ -1454,7 +1453,6 @@ var PDFView = {
case 'outline':
thumbsButton.classList.remove('toggled');
outlineButton.classList.add('toggled');
@@ -28,7 +28,7 @@ index 78088ec..2d2eccc 100644
thumbsView.classList.add('hidden');
outlineView.classList.remove('hidden');
attachmentsView.classList.add('hidden');
-@@ -1888,11 +1886,6 @@ function webViewerInitialized() {
+@@ -1900,11 +1898,6 @@ function webViewerInitialized() {
PDFView.switchSidebarView('outline');
});
diff --git a/debian/patches/series b/debian/patches/series
index ec3ac1d..716e4e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-No-embedded-PDF.patch
0002-Fix-build-versions-in-generated-file.patch
-0003-Don-t-fetch-external-data.patch
-0004-Add-adobe-CMaps.patch
+0003-Add-adobe-CMaps.patch
--
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