[Pkg-javascript-commits] [pdf.js] 409/414: 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 e435d775473eff46cfbdf11926134d5d456516d7
Author: David Prévot <david at tilapin.org>
Date:   Mon Jun 20 08:39:46 2016 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0001-No-embedded-PDF.patch          |  6 +++---
 ...0002-Fix-build-versions-in-generated-file.patch | 22 ++++++++--------------
 ...move-ShellJS-copy-and-use-the-NPM-version.patch |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/debian/patches/0001-No-embedded-PDF.patch b/debian/patches/0001-No-embedded-PDF.patch
index 893d228..2b3e585 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 4e3448c..eebf94b 100644
+index 0815b16..b442c32 100644
 --- a/make.js
 +++ b/make.js
-@@ -134,7 +134,6 @@ target.generic = function() {
+@@ -141,7 +141,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 4e3448c..eebf94b 100644
        ['external/bcmaps/*', GENERIC_DIR + '/web/cmaps/'],
        ['web/locale', GENERIC_DIR + '/web']
      ],
-@@ -662,7 +661,6 @@ target.minified = function() {
+@@ -707,7 +706,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 abf195f..9c51b2a 100644
--- a/debian/patches/0002-Fix-build-versions-in-generated-file.patch
+++ b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
@@ -13,20 +13,10 @@ Forwarded: not-needed
  1 file changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/make.js b/make.js
-index eebf94b..532fc1b 100644
+index b442c32..c410260 100644
 --- a/make.js
 +++ b/make.js
-@@ -493,8 +493,7 @@ target.bundle = function(args) {
- 
-     var bundleContent = cat(SRC_FILES),
-         bundleVersion = VERSION,
--        bundleBuild = exec('git log --format="%h" -n 1',
--          {silent: true}).output.replace('\n', '');
-+        bundleBuild = 'debian';
- 
-     crlfchecker.checkIfCrlfIsPresent(SRC_FILES);
- 
-@@ -736,14 +735,7 @@ target.buildnumber = function() {
+@@ -781,17 +781,9 @@ target.buildnumber = function() {
    echo();
    echo('### Getting extension build number');
  
@@ -34,11 +24,15 @@ index eebf94b..532fc1b 100644
 -                   config.baseVersion + '..', {silent: true}).output;
 -  // Build number is the number of commits since base version
 -  BUILD_NUMBER = lines ? lines.match(/\n/g).length : 0;
--
++  VERSION = '@EXTENSION_VERSION@';
+ 
 -  echo('Extension build number: ' + BUILD_NUMBER);
 -
 -  VERSION = config.versionPrefix + BUILD_NUMBER;
-+  VERSION = '@EXTENSION_VERSION@';
+-
+-  BUILD_COMMIT = exec('git log --format="%h" -n 1',  {silent: true}).
+-    output.replace('\n', '');
++  BUILD_COMMIT = 'debian';
  };
  
  //
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 a3a43e5..32cbf57 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 ade9fc8..52ea081 100644
+index c410260..1f451e4 100644
 --- a/make.js
 +++ b/make.js
 @@ -18,14 +18,7 @@

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