[Pkg-javascript-commits] [pdf.js] 156/161: Refresh patches

[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 118adcaa715816a33a3eecc1a3681af1fd44f59d
Author: David Prévot <taffit at debian.org>
Date:   Fri Apr 18 18:13:43 2014 -0400

    Refresh patches
---
 debian/patches/0001-No-embedded-PDF.patch                  |  6 +++---
 .../0002-Fix-build-versions-in-generated-file.patch        |  4 ++--
 .../0003-Build-everything-in-a-single-repository.patch     | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/0001-No-embedded-PDF.patch b/debian/patches/0001-No-embedded-PDF.patch
index b52827c..e1eac44 100644
--- a/debian/patches/0001-No-embedded-PDF.patch
+++ b/debian/patches/0001-No-embedded-PDF.patch
@@ -13,14 +13,14 @@ Forwarded: not-needed
  1 file changed, 1 deletion(-)
 
 diff --git a/make.js b/make.js
-index 8a1a048..fe67b4e 100644
+index 6be2eac..51e923b 100644
 --- a/make.js
 +++ b/make.js
-@@ -107,7 +107,6 @@ target.generic = function() {
+@@ -112,7 +112,6 @@ target.generic = function() {
        ['external/webL10n/l10n.js', GENERIC_DIR + '/web'],
        ['web/viewer.css', GENERIC_DIR + '/web'],
        ['web/compatibility.js', GENERIC_DIR + '/web'],
 -      ['web/compressed.tracemonkey-pldi-09.pdf', GENERIC_DIR + '/web'],
+       ['external/bcmaps/*', GENERIC_DIR + '/web/cmaps/'],
        ['web/locale', GENERIC_DIR + '/web']
      ],
-     preprocess: [
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 d4a13d9..d54e578 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(+), 3 deletions(-)
 
 diff --git a/make.js b/make.js
-index fe67b4e..63e6112 100644
+index 51e923b..680a49f 100644
 --- a/make.js
 +++ b/make.js
-@@ -250,9 +250,8 @@ target.bundle = function(args) {
+@@ -284,9 +284,8 @@ target.bundle = function(args) {
      }
  
      var bundle = cat(SRC_FILES),
diff --git a/debian/patches/0003-Build-everything-in-a-single-repository.patch b/debian/patches/0003-Build-everything-in-a-single-repository.patch
index 1723a6c..3abe711 100644
--- a/debian/patches/0003-Build-everything-in-a-single-repository.patch
+++ b/debian/patches/0003-Build-everything-in-a-single-repository.patch
@@ -12,18 +12,18 @@ Forwarded: no
  3 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/make.js b/make.js
-index 63e6112..b6dc4f1 100644
+index 680a49f..99afe6e 100644
 --- a/make.js
 +++ b/make.js
-@@ -95,7 +95,6 @@ target.generic = function() {
+@@ -99,7 +99,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');
  
-   var defines = builder.merge(DEFINES, {GENERIC: true});
-@@ -110,7 +109,7 @@ target.generic = function() {
+@@ -116,7 +115,7 @@ target.generic = function() {
        ['web/locale', GENERIC_DIR + '/web']
      ],
      preprocess: [
@@ -43,7 +43,7 @@ index d528a9d..406a67e 100644
 -<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 f1fd3ae..538a18d 100644
+index 0746b3b..bbda100 100644
 --- a/web/viewer.js
 +++ b/web/viewer.js
 @@ -60,7 +60,7 @@ var FindStates = {
@@ -53,5 +53,5 @@ index f1fd3ae..538a18d 100644
 -//PDFJS.workerSrc = '../build/pdf.worker.js';
 +//PDFJS.workerSrc = './pdf.worker.js';
  //#endif
- 
- var mozL10n = document.mozL10n || document.webL10n;
+ //#if !PRODUCTION
+ PDFJS.cMapUrl = '../external/bcmaps/';

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