[Pkg-javascript-commits] [pdf.js] 408/414: Drop ownCloud-specific bits
David Prévot
taffit at moszumanska.debian.org
Tue Jun 28 17:12:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit 02eb0617ad8912a51036145f563f8bd8bfb7ca89
Author: David Prévot <david at tilapin.org>
Date: Mon Jun 20 08:39:31 2016 -0400
Drop ownCloud-specific bits
---
debian/control | 1 -
debian/install | 1 -
...loud-specific-loading-of-the-pdf-document.patch | 23 ------------
.../0005-adjust-close-button-position.patch | 22 ------------
.../ownCloud/0006-open-buttons-removed.patch | 23 ------------
...e-PDF-viewer-working-again-in-public-view.patch | 36 -------------------
...ead-of-encode-because-we-need-to-pass-HTM.patch | 26 --------------
.../ownCloud/0009-URL-encode-needed-values.patch | 41 ----------------------
...010-Build-ownCloud-specific-version-in-oc.patch | 22 ------------
.../ownCloud/0011-Drop-attachment-feature.patch | 41 ----------------------
debian/rules | 5 ---
11 files changed, 241 deletions(-)
diff --git a/debian/control b/debian/control
index aa47ec0..d714d85 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: web
Priority: optional
Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
Uploaders: David Prévot <taffit at debian.org>,
- ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alioth.debian.org>,
Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 9), mozilla-devscripts, nodejs
Standards-Version: 3.9.6
diff --git a/debian/install b/debian/install
index f3bdb2d..497fa6e 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
build/generic/build usr/share/javascript/pdf
build/generic/web usr/share/javascript/pdf
-oc/generic/web/viewer.js usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs
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
deleted file mode 100644
index ada1859..0000000
--- a/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?utf-8?q?Thomas_M=C3=BCller?= <thomas.mueller at tmit.eu>
-Date: Wed, 26 Mar 2014 15:34:25 +0100
-Subject: fix ownCloud specific loading of the pdf document
-
-origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/f58e37a8ffadfaf4fac893b87987e83efe6963ec
----
- web/viewer.js | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/web/viewer.js b/web/viewer.js
-index 7226cc1..e286cc7 100644
---- a/web/viewer.js
-+++ b/web/viewer.js
-@@ -1627,7 +1627,8 @@ function webViewerInitialized() {
- }
-
- if (file) {
-- PDFViewerApplication.open(file);
-+ // owncould customization to load file from files app
-+ PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
- }
- //#endif
- //#if CHROME
diff --git a/debian/patches/ownCloud/0005-adjust-close-button-position.patch b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
deleted file mode 100644
index 8efce16..0000000
--- a/debian/patches/ownCloud/0005-adjust-close-button-position.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?Thomas_M=C3=BCller?= <thomas.mueller at tmit.eu>
-Date: Wed, 26 Mar 2014 15:35:18 +0100
-Subject: adjust close button position
-
-origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/f7c625773b621bedff4fd9e18fd7c01d34f3b871
----
- web/viewer.css | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/web/viewer.css b/web/viewer.css
-index b782684..321248f 100644
---- a/web/viewer.css
-+++ b/web/viewer.css
-@@ -509,7 +509,7 @@ html[dir='ltr'] #toolbarViewerRight,
- html[dir='rtl'] #toolbarViewerLeft {
- position: absolute;
- top: 0;
-- right: 0;
-+ right: 25px;
- }
- html[dir='ltr'] #toolbarViewerLeft > *,
- html[dir='ltr'] #toolbarViewerMiddle > *,
diff --git a/debian/patches/ownCloud/0006-open-buttons-removed.patch b/debian/patches/ownCloud/0006-open-buttons-removed.patch
deleted file mode 100644
index d1cbf4c..0000000
--- a/debian/patches/ownCloud/0006-open-buttons-removed.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?utf-8?q?Thomas_M=C3=BCller?= <thomas.mueller at tmit.eu>
-Date: Thu, 27 Mar 2014 12:41:24 +0100
-Subject: open buttons removed
-
-origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/71ab97f9b074c6128bff6f1b1690e7f52571f529
----
- web/viewer.js | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/web/viewer.js b/web/viewer.js
-index e286cc7..c86d710 100644
---- a/web/viewer.js
-+++ b/web/viewer.js
-@@ -1590,9 +1590,6 @@ function webViewerInitialized() {
- document.getElementById('presentationMode').addEventListener('click',
- SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
-
-- document.getElementById('openFile').addEventListener('click',
-- SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
--
- document.getElementById('print').addEventListener('click',
- SecondaryToolbar.printClick.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
deleted file mode 100644
index 87b0495..0000000
--- a/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Lukas Reschke <lukas at statuscode.ch>
-Date: Tue, 17 Jun 2014 21:22:38 +0200
-Subject: Make PDF viewer working again in public view
-
-Do not require a login
-
-Add support for public URL
-
-origin: vendor,
- https://github.com/owncloud/files_pdfviewer/commit/fc53d5709d69a61f1f5481107fa9f1166f406245
- https://github.com/owncloud/files_pdfviewer/commit/524db159f67d11fb42d4118173381600ca2de4ab
----
- web/viewer.js | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/web/viewer.js b/web/viewer.js
-index c86d710..e852caa 100644
---- a/web/viewer.js
-+++ b/web/viewer.js
-@@ -1623,9 +1623,13 @@ function webViewerInitialized() {
- return;
- }
-
-- if (file) {
-- // owncould customization to load file from files app
-- PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
-+ // owncould customization to load file
-+ if (file && dir !== '') {
-+ // Logged in
-+ PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
-+ } else {
-+ // Public view
-+ PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+encodeURIComponent(window.file)+"&download", 1.0);
- }
- //#endif
- //#if CHROME
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
deleted file mode 100644
index 1f20f0e..0000000
--- a/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Lukas Reschke <lukas at statuscode.ch>
-Date: Tue, 17 Jun 2014 23:05:28 +0200
-Subject: Decode instead of encode because we need to pass HTML values
-
-origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/9f1fcd2d1a18e5ef8aa1fde24e99e4fc43dfd1bf
----
- web/viewer.js | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/web/viewer.js b/web/viewer.js
-index e852caa..5f8917f 100644
---- a/web/viewer.js
-+++ b/web/viewer.js
-@@ -1626,10 +1626,10 @@ function webViewerInitialized() {
- // owncould customization to load file
- if (file && dir !== '') {
- // Logged in
-- PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
-+ PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+decodeURIComponent(window.file)+"&dir="+decodeURIComponent(window.dir), 1.0);
- } else {
- // Public view
-- PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+encodeURIComponent(window.file)+"&download", 1.0);
-+ PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+decodeURIComponent(window.file)+"&download", 1.0);
- }
- //#endif
- //#if CHROME
diff --git a/debian/patches/ownCloud/0009-URL-encode-needed-values.patch b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
deleted file mode 100644
index f6af6eb..0000000
--- a/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Lukas Reschke <lukas at statuscode.ch>
-Date: Sun, 29 Jun 2014 14:17:46 +0200
-Subject: URL encode needed values
-
-To test upload a PDF file once with special characters (e.g. "This+Is+a+test.pdf") and one without (e.g. "ThisIsATest.pdf").
-
-Then test the following test-cases:
-
-- [ ] Viewing a PDF file as logged-in user still work
-- [ ] Viewing a shared PDF as logged-in user still work
-- [ ] Viewing a public shared PDF as logged-in user still work
-- [ ] Viewing a public shared PDF as anonymous user still work
-- [ ] Viewing a public shared PDF in a folder still work
-
-Bug-ownCloud: https://github.com/owncloud/files_pdfviewer/issues/11
-origin: vendor,
- https://github.com/owncloud/files_pdfviewer/commit/ac7560cc0fcb17e18fb48bf32347dd8fb3b96b8c
- https://github.com/owncloud/files_pdfviewer/commit/fd0ed34d9c10c14b8bc4c99c1ec6370c738bec7f
----
- web/viewer.js | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/web/viewer.js b/web/viewer.js
-index 5f8917f..786ce6b 100644
---- a/web/viewer.js
-+++ b/web/viewer.js
-@@ -1625,11 +1625,11 @@ function webViewerInitialized() {
-
- // owncould customization to load file
- if (file && dir !== '') {
-- // Logged in
-- PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+decodeURIComponent(window.file)+"&dir="+decodeURIComponent(window.dir), 1.0);
-+ // Logged in
-+ PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+window.file+"&dir="+window.dir, 1.0);
- } else {
- // Public view
-- PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+decodeURIComponent(window.file)+"&download", 1.0);
-+ PDFViewerApplication.open(OC.linkTo('', 'public.php')+'?service=files'+"&t="+window.file+"&download", 1.0);
- }
- //#endif
- //#if CHROME
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
deleted file mode 100644
index b277183..0000000
--- a/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Sun, 27 Jul 2014 15:49:22 -0400
-Subject: Build ownCloud-specific version in oc
-
-Forwarded: not-needed
----
- make.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/make.js b/make.js
-index 532fc1b..ade9fc8 100644
---- a/make.js
-+++ b/make.js
-@@ -39,7 +39,7 @@ var BUILD_NUMBER,
- VERSION;
-
- var ROOT_DIR = __dirname + '/', // absolute path to project's root
-- BUILD_DIR = 'build/',
-+ BUILD_DIR = 'oc/',
- SRC_DIR = 'src/',
- BUILD_TARGET = BUILD_DIR + 'pdf.js',
- BUILD_WORKER_TARGET = BUILD_DIR + 'pdf.worker.js',
diff --git a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
deleted file mode 100644
index 7414559..0000000
--- a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Sun, 27 Jul 2014 18:49:11 -0400
-Subject: Drop attachment feature
-
-ownCloud currently seems to choke on it.
----
- web/viewer.js | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/web/viewer.js b/web/viewer.js
-index 786ce6b..58e3463 100644
---- a/web/viewer.js
-+++ b/web/viewer.js
-@@ -1137,7 +1137,6 @@ var PDFViewerApplication = {
-
- thumbsButton.classList.add('toggled');
- outlineButton.classList.remove('toggled');
-- attachmentsButton.classList.remove('toggled');
- thumbsView.classList.remove('hidden');
- outlineView.classList.add('hidden');
- attachmentsView.classList.add('hidden');
-@@ -1155,7 +1154,6 @@ var PDFViewerApplication = {
- }
- thumbsButton.classList.remove('toggled');
- outlineButton.classList.add('toggled');
-- attachmentsButton.classList.remove('toggled');
- thumbsView.classList.add('hidden');
- outlineView.classList.remove('hidden');
- attachmentsView.classList.add('hidden');
-@@ -1542,11 +1540,6 @@ function webViewerInitialized() {
- PDFViewerApplication.outline.toggleOutlineTree();
- });
-
-- document.getElementById('viewAttachments').addEventListener('click',
-- function() {
-- PDFViewerApplication.switchSidebarView('attachments');
-- });
--
- document.getElementById('previous').addEventListener('click',
- function() {
- PDFViewerApplication.page--;
diff --git a/debian/rules b/debian/rules
index c28b471..20cffa5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,6 @@ override_dh_auto_build:
nodejs make cmaps
nodejs make extension
nodejs make generic
- # Build ownCloud-specific version
- for i in debian/patches/ownCloud/*;do patch -p1 < $$i;done
- nodejs make generic
- for i in `ls -r $(CURDIR)/debian/patches/ownCloud/*`;do patch -Rp1 < $$i;done
# Restore initial Makefile
mv make.js.bkp make.js
dh_auto_build
@@ -24,7 +20,6 @@ override_dh_auto_build:
override_dh_auto_clean:
nodejs make clean
rm -rf extensions/firefox/locale
- rm -rf oc
rm -rf web/locale
dh_auto_clean
--
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