[Pkg-javascript-commits] [mathjax] 02/03: Update packer and combiner code to the latest upstream version.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository mathjax.

commit 72ccba6a8b2d23c2edcea8c950a47e223f5bd8f0
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Oct 16 22:36:19 2016 +0300

    Update packer and combiner code to the latest upstream version.
---
 debian/README.source                   | 2 +-
 debian/changelog                       | 1 +
 debian/combiner/combineMJlist          | 9 ++++-----
 debian/combiner/combineMJlist-unpacked | 2 ++
 debian/combiner/template-unpacked.js   | 5 +----
 debian/combiner/template.js            | 4 +---
 debian/packer/template.js              | 2 +-
 debian/packer/yuiFilter                | 2 +-
 8 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index ad844eb..3076d77 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -11,4 +11,4 @@ The Debian modifications are:
 * Do not require the configuration script.
 
 The latest version is based on upstream commit
-4c4462d68f0b546163dc982ef034fdb1622c5218.
+fb81740d47d25f621e8de61dc14e587593ff693e.
diff --git a/debian/changelog b/debian/changelog
index 7f9c220..3cb4271 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mathjax (2.7.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update packer and combiner code to the latest upstream version.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 16 Oct 2016 22:35:42 +0300
 
diff --git a/debian/combiner/combineMJlist b/debian/combiner/combineMJlist
index b70afb7..94205cc 100755
--- a/debian/combiner/combineMJlist
+++ b/debian/combiner/combineMJlist
@@ -54,11 +54,10 @@ print "Creating $outfile\n";
 open(CONFIG,">","$MJX/$outfile") || die "Can't write $MJX/$outfile: $!\n";
 print CONFIG $config;
 
-if (scalar(@config)) {
-  print CONFIG "MathJax.Hub.Config({\n  ";
-  print CONFIG join("\n  ", at config);
-  print CONFIG "\n});\n\n";
-}
+print CONFIG "MathJax.Hub.Config({\n";
+print CONFIG "  extensions: ['[Contrib]/a11y/accessibility-menu.js']";
+print CONFIG ",\n  ",join("\n  ", at config) if scalar(@config);
+print CONFIG "\n});\n\n";
 
 foreach $file (@files) {
   print "  $file\n";
diff --git a/debian/combiner/combineMJlist-unpacked b/debian/combiner/combineMJlist-unpacked
index 55529d7..dc307b8 100755
--- a/debian/combiner/combineMJlist-unpacked
+++ b/debian/combiner/combineMJlist-unpacked
@@ -42,6 +42,8 @@ foreach $file (@files) {
   if ($file =~ m!^config/(.*)!) {push(@CONFIG,"\"$1\"")}
 }
 
+push(@EXTENSIONS,'"[Contrib]/a11y/accessibility-menu.js"');
+
 @HUB = ();
 push(@HUB,"config: [".join(",", at CONFIG)."]") if scalar(@CONFIG);
 push(@HUB,"extensions: [".join(",", at EXTENSIONS)."]") if scalar(@EXTENSIONS);
diff --git a/debian/combiner/template-unpacked.js b/debian/combiner/template-unpacked.js
index 352aa85..7abc64d 100644
--- a/debian/combiner/template-unpacked.js
+++ b/debian/combiner/template-unpacked.js
@@ -1,11 +1,8 @@
-/* -*- Mode: Javascript; indent-tabs-mode:nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-
 /*************************************************************
  *
  *  %%% NAME %%%
  *  
- *  Copyright (c) 2010-2015 The MathJax Consortium
+ *  Copyright (c) 2010-2016 The MathJax Consortium
  *
  *  Part of the MathJax library.
  *  See http://www.mathjax.org for details.
diff --git a/debian/combiner/template.js b/debian/combiner/template.js
index 91b6f3f..84cd063 100644
--- a/debian/combiner/template.js
+++ b/debian/combiner/template.js
@@ -1,7 +1,7 @@
 /*
  *  %%% NAME %%%
  *  
- *  Copyright (c) 2010-2015 The MathJax Consortium
+ *  Copyright (c) 2010-2016 The MathJax Consortium
  *
  *  Part of the MathJax library.
  *  See http://www.mathjax.org for details.
@@ -16,5 +16,3 @@ MathJax.Ajax.Preloading(
 %%% FILES %%%
 );
 
-MathJax.Hub.Config({"v1.0-compatible":false});
-
diff --git a/debian/packer/template.js b/debian/packer/template.js
index 4c92a46..ecd84ae 100644
--- a/debian/packer/template.js
+++ b/debian/packer/template.js
@@ -1,7 +1,7 @@
 /*
  *  %%%NAME%%%
  *
- *  Copyright (c) 2009-2015 The MathJax Consortium
+ *  Copyright (c) 2009-2016 The MathJax Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/debian/packer/yuiFilter b/debian/packer/yuiFilter
index e6fcb49..9108514 100755
--- a/debian/packer/yuiFilter
+++ b/debian/packer/yuiFilter
@@ -9,7 +9,7 @@ while ($line = <>) {
     $line = <>; $line = <>; # skip next two lines
   } elsif ($line =~ m/Using 'eval' is not recommended/) {
     $line = <>; $line = <>; # skip next two lines
-  } elsif ($line =~ m/Using charset MacRoman/) {
+  } elsif ($line =~ m/Using charset (MacRoman|UTF)/) {
     $line = <>; # skip blank line
   } else {
     print $line;

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