[Pkg-javascript-commits] [pdf.js] 135/141: Remove the same directory hack

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository pdf.js.

commit b1a45a60f9f633fffc78301dd25a601c7971eb6b
Author: David Prévot <taffit at debian.org>
Date:   Sat Apr 19 15:29:43 2014 -0400

    Remove the same directory hack
---
 debian/install                                     |  3 +-
 ...3-Build-everything-in-a-single-repository.patch | 57 ----------------------
 ....patch => 0003-Don-t-fetch-external-data.patch} |  0
 ...dobe-CMaps.patch => 0004-Add-adobe-CMaps.patch} |  0
 debian/patches/series                              |  5 +-
 5 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/debian/install b/debian/install
index c81036c..2ec6236 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,2 @@
-build/generic/web/*	/usr/share/javascript/pdf
+build/generic/build	/usr/share/javascript/pdf
+build/generic/web	/usr/share/javascript/pdf
diff --git a/debian/patches/0003-Build-everything-in-a-single-repository.patch b/debian/patches/0003-Build-everything-in-a-single-repository.patch
deleted file mode 100644
index 14b9e85..0000000
--- a/debian/patches/0003-Build-everything-in-a-single-repository.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Mon, 8 Apr 2013 12:51:03 -0400
-Subject: Build everything in a single repository
-
-In order not to spread files everywhere, PDF.js will be installed in
-the same main directory
-Forwarded: no
----
- make.js                 | 3 +--
- web/viewer-snippet.html | 2 +-
- web/viewer.js           | 2 +-
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/make.js b/make.js
-index 26341b8..e25caf8 100644
---- a/make.js
-+++ b/make.js
-@@ -108,7 +108,6 @@ target.generic = function() {
- 
-   rm('-rf', GENERIC_DIR);
-   mkdir('-p', GENERIC_DIR);
--  mkdir('-p', GENERIC_DIR + BUILD_DIR);
-   mkdir('-p', GENERIC_DIR + '/web');
-   mkdir('-p', GENERIC_DIR + '/web/cmaps');
- 
-@@ -126,7 +125,7 @@ target.generic = function() {
-       ['web/locale', GENERIC_DIR + '/web']
-     ],
-     preprocess: [
--      [BUILD_TARGETS, GENERIC_DIR + BUILD_DIR],
-+      [BUILD_TARGETS, GENERIC_DIR + '/web'],
-       [COMMON_WEB_FILES_PREPROCESS, GENERIC_DIR + '/web']
-     ]
-   };
-diff --git a/web/viewer-snippet.html b/web/viewer-snippet.html
-index d528a9d..406a67e 100644
---- a/web/viewer-snippet.html
-+++ b/web/viewer-snippet.html
-@@ -1,4 +1,4 @@
- <!-- This snippet is used in production, see Makefile -->
- <link rel="resource" type="application/l10n" href="locale/locale.properties"/>
- <script type="text/javascript" src="l10n.js"></script>
--<script type="text/javascript" src="../build/pdf.js"></script>
-+<script type="text/javascript" src="pdf.js"></script>
-diff --git a/web/viewer.js b/web/viewer.js
-index 9ecfc0d..3d8224e 100644
---- a/web/viewer.js
-+++ b/web/viewer.js
-@@ -60,7 +60,7 @@ var FindStates = {
- 
- PDFJS.imageResourcesPath = './images/';
- //#if (FIREFOX || MOZCENTRAL || B2G || GENERIC || CHROME)
--//PDFJS.workerSrc = '../build/pdf.worker.js';
-+//PDFJS.workerSrc = './pdf.worker.js';
- //#endif
- //#if !PRODUCTION
- PDFJS.cMapUrl = '../external/bcmaps/';
diff --git a/debian/patches/0004-Don-t-fetch-external-data.patch b/debian/patches/0003-Don-t-fetch-external-data.patch
similarity index 100%
rename from debian/patches/0004-Don-t-fetch-external-data.patch
rename to debian/patches/0003-Don-t-fetch-external-data.patch
diff --git a/debian/patches/0005-Add-adobe-CMaps.patch b/debian/patches/0004-Add-adobe-CMaps.patch
similarity index 100%
rename from debian/patches/0005-Add-adobe-CMaps.patch
rename to debian/patches/0004-Add-adobe-CMaps.patch
diff --git a/debian/patches/series b/debian/patches/series
index 88dc70f..ec3ac1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-No-embedded-PDF.patch
 0002-Fix-build-versions-in-generated-file.patch
-0003-Build-everything-in-a-single-repository.patch
-0004-Don-t-fetch-external-data.patch
-0005-Add-adobe-CMaps.patch
+0003-Don-t-fetch-external-data.patch
+0004-Add-adobe-CMaps.patch

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