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

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Jan 31 09:55:31 UTC 2015 

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

mitya57 pushed a commit to branch master
in repository mathjax.

commit 219ca842dc73fbd7250827bc25a2ff718b521ad9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jan 31 12:52:20 2015 +0300

    Update packer and combiner code to the latest upstream version.
---
 debian/README.source                                 | 3 +++
 debian/changelog                                     | 1 +
 debian/combiner/lists/AM_HTMLorMML-full.lis          | 3 +++
 debian/combiner/lists/AM_HTMLorMML.lis               | 3 +++
 debian/combiner/lists/Accessible-full.lis            | 3 +++
 debian/combiner/lists/Accessible.lis                 | 3 +++
 debian/combiner/lists/MML_HTMLorMML-full.lis         | 3 +++
 debian/combiner/lists/MML_HTMLorMML.lis              | 3 +++
 debian/combiner/lists/TeX-AMS-MML_HTMLorMML-full.lis | 3 +++
 debian/combiner/lists/TeX-AMS-MML_HTMLorMML.lis      | 3 +++
 debian/combiner/lists/TeX-AMS-MML_SVG-full.lis       | 3 +++
 debian/combiner/lists/TeX-AMS-MML_SVG.lis            | 3 +++
 debian/combiner/lists/TeX-AMS_HTML-full.lis          | 3 +++
 debian/combiner/lists/TeX-AMS_HTML.lis               | 3 +++
 debian/combiner/lists/TeX-MML-AM_HTMLorMML-full.lis  | 3 +++
 debian/combiner/lists/TeX-MML-AM_HTMLorMML.lis       | 3 +++
 debian/combiner/template-unpacked.js                 | 2 +-
 debian/combiner/template.js                          | 2 +-
 debian/packer/packMJfile                             | 8 ++++++--
 debian/packer/template.js                            | 2 +-
 20 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 66e4881..a0f3dd8 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -9,3 +9,6 @@ The Debian modifications are:
   in `packer/packMJfile`;
 * Replace current working directory in MathJax with `MathJax` string;
 * Do not require the configuration script.
+
+The latest version is based on upstream commit
+15ad0afd8a48eab267976de5e31c0734b8d92301.
diff --git a/debian/changelog b/debian/changelog
index 1c6af19..0c9f2c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mathjax (2.5.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update packer and combiner code to the latest upstream version.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 31 Jan 2015 12:45:06 +0300
 
diff --git a/debian/combiner/lists/AM_HTMLorMML-full.lis b/debian/combiner/lists/AM_HTMLorMML-full.lis
index a62252a..f3ce21c 100644
--- a/debian/combiner/lists/AM_HTMLorMML-full.lis
+++ b/debian/combiner/lists/AM_HTMLorMML-full.lis
@@ -1,6 +1,7 @@
 jax/input/AsciiMath/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/asciimath2jax.js
 extensions/MathEvents.js
@@ -12,3 +13,5 @@ jax/input/AsciiMath/jax.js
 jax/output/NativeMML/jax.js
 jax/output/HTML-CSS/jax.js
 jax/output/HTML-CSS/autoload/mtable.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/AM_HTMLorMML.lis b/debian/combiner/lists/AM_HTMLorMML.lis
index a97c238..ff600ca 100644
--- a/debian/combiner/lists/AM_HTMLorMML.lis
+++ b/debian/combiner/lists/AM_HTMLorMML.lis
@@ -1,6 +1,7 @@
 jax/input/AsciiMath/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/asciimath2jax.js
 extensions/MathEvents.js
@@ -9,3 +10,5 @@ extensions/MathMenu.js
 jax/element/mml/jax.js
 extensions/toMathML.js
 jax/input/AsciiMath/jax.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/Accessible-full.lis b/debian/combiner/lists/Accessible-full.lis
index cfc3dd9..a9777ed 100644
--- a/debian/combiner/lists/Accessible-full.lis
+++ b/debian/combiner/lists/Accessible-full.lis
@@ -2,6 +2,7 @@ jax/input/TeX/config.js
 jax/input/MathML/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/tex2jax.js
 extensions/mml2jax.js
@@ -19,6 +20,8 @@ jax/input/MathML/jax.js
 jax/output/NativeMML/jax.js
 jax/output/HTML-CSS/jax.js
 jax/output/HTML-CSS/autoload/mtable.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
 
 menuSettings: {
   zoom: "Double-Click",
diff --git a/debian/combiner/lists/Accessible.lis b/debian/combiner/lists/Accessible.lis
index 8b8dc11..4088d50 100644
--- a/debian/combiner/lists/Accessible.lis
+++ b/debian/combiner/lists/Accessible.lis
@@ -2,6 +2,7 @@ jax/input/TeX/config.js
 jax/input/MathML/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/tex2jax.js
 extensions/mml2jax.js
@@ -16,6 +17,8 @@ jax/input/TeX/jax.js
 extensions/TeX/AMSmath.js
 extensions/TeX/AMSsymbols.js
 jax/input/MathML/jax.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
 
 menuSettings: {
   zoom: "Double-Click",
diff --git a/debian/combiner/lists/MML_HTMLorMML-full.lis b/debian/combiner/lists/MML_HTMLorMML-full.lis
index 00829b3..8008fbb 100644
--- a/debian/combiner/lists/MML_HTMLorMML-full.lis
+++ b/debian/combiner/lists/MML_HTMLorMML-full.lis
@@ -1,6 +1,7 @@
 jax/input/MathML/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/mml2jax.js
 extensions/MathEvents.js
@@ -12,3 +13,5 @@ jax/input/MathML/jax.js
 jax/output/NativeMML/jax.js
 jax/output/HTML-CSS/jax.js
 jax/output/HTML-CSS/autoload/mtable.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/MML_HTMLorMML.lis b/debian/combiner/lists/MML_HTMLorMML.lis
index 35ee100..4794a83 100644
--- a/debian/combiner/lists/MML_HTMLorMML.lis
+++ b/debian/combiner/lists/MML_HTMLorMML.lis
@@ -1,6 +1,7 @@
 jax/input/MathML/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/mml2jax.js
 extensions/MathEvents.js
@@ -9,3 +10,5 @@ extensions/MathMenu.js
 jax/element/mml/jax.js
 extensions/toMathML.js
 jax/input/MathML/jax.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/TeX-AMS-MML_HTMLorMML-full.lis b/debian/combiner/lists/TeX-AMS-MML_HTMLorMML-full.lis
index 0fe91c4..ac87036 100644
--- a/debian/combiner/lists/TeX-AMS-MML_HTMLorMML-full.lis
+++ b/debian/combiner/lists/TeX-AMS-MML_HTMLorMML-full.lis
@@ -2,6 +2,7 @@ jax/input/TeX/config.js
 jax/input/MathML/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/tex2jax.js
 extensions/mml2jax.js
@@ -19,3 +20,5 @@ jax/input/MathML/jax.js
 jax/output/NativeMML/jax.js
 jax/output/HTML-CSS/jax.js
 jax/output/HTML-CSS/autoload/mtable.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/TeX-AMS-MML_HTMLorMML.lis b/debian/combiner/lists/TeX-AMS-MML_HTMLorMML.lis
index 1332333..6a89cad 100644
--- a/debian/combiner/lists/TeX-AMS-MML_HTMLorMML.lis
+++ b/debian/combiner/lists/TeX-AMS-MML_HTMLorMML.lis
@@ -2,6 +2,7 @@ jax/input/TeX/config.js
 jax/input/MathML/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/tex2jax.js
 extensions/mml2jax.js
@@ -16,3 +17,5 @@ jax/input/TeX/jax.js
 extensions/TeX/AMSmath.js
 extensions/TeX/AMSsymbols.js
 jax/input/MathML/jax.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/TeX-AMS-MML_SVG-full.lis b/debian/combiner/lists/TeX-AMS-MML_SVG-full.lis
index 7f0f942..8e96f73 100644
--- a/debian/combiner/lists/TeX-AMS-MML_SVG-full.lis
+++ b/debian/combiner/lists/TeX-AMS-MML_SVG-full.lis
@@ -1,6 +1,7 @@
 jax/input/TeX/config.js
 jax/input/MathML/config.js
 jax/output/SVG/config.js
+jax/output/CommonHTML/config.js
 extensions/tex2jax.js
 extensions/mml2jax.js
 extensions/MathEvents.js
@@ -16,3 +17,5 @@ extensions/TeX/AMSsymbols.js
 jax/input/MathML/jax.js
 jax/output/SVG/jax.js
 jax/output/SVG/autoload/mtable.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/TeX-AMS-MML_SVG.lis b/debian/combiner/lists/TeX-AMS-MML_SVG.lis
index bd68d69..5f3d3e4 100644
--- a/debian/combiner/lists/TeX-AMS-MML_SVG.lis
+++ b/debian/combiner/lists/TeX-AMS-MML_SVG.lis
@@ -1,6 +1,7 @@
 jax/input/TeX/config.js
 jax/input/MathML/config.js
 jax/output/SVG/config.js
+jax/output/CommonHTML/config.js
 extensions/tex2jax.js
 extensions/mml2jax.js
 extensions/MathEvents.js
@@ -14,3 +15,5 @@ jax/input/TeX/jax.js
 extensions/TeX/AMSmath.js
 extensions/TeX/AMSsymbols.js
 jax/input/MathML/jax.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/TeX-AMS_HTML-full.lis b/debian/combiner/lists/TeX-AMS_HTML-full.lis
index a615b59..3b78473 100644
--- a/debian/combiner/lists/TeX-AMS_HTML-full.lis
+++ b/debian/combiner/lists/TeX-AMS_HTML-full.lis
@@ -1,5 +1,6 @@
 jax/input/TeX/config.js
 jax/output/HTML-CSS/config.js
+jax/output/CommonHTML/config.js
 extensions/tex2jax.js
 extensions/MathEvents.js
 extensions/MathZoom.js
@@ -13,3 +14,5 @@ extensions/TeX/AMSmath.js
 extensions/TeX/AMSsymbols.js
 jax/output/HTML-CSS/jax.js
 jax/output/HTML-CSS/autoload/mtable.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/TeX-AMS_HTML.lis b/debian/combiner/lists/TeX-AMS_HTML.lis
index 0ca638b..854abff 100644
--- a/debian/combiner/lists/TeX-AMS_HTML.lis
+++ b/debian/combiner/lists/TeX-AMS_HTML.lis
@@ -1,5 +1,6 @@
 jax/input/TeX/config.js
 jax/output/HTML-CSS/config.js
+jax/output/CommonHTML/config.js
 extensions/tex2jax.js
 extensions/MathEvents.js
 extensions/MathZoom.js
@@ -11,3 +12,5 @@ extensions/TeX/noUndefined.js
 jax/input/TeX/jax.js
 extensions/TeX/AMSmath.js
 extensions/TeX/AMSsymbols.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/TeX-MML-AM_HTMLorMML-full.lis b/debian/combiner/lists/TeX-MML-AM_HTMLorMML-full.lis
index 9b5a28a..a32ea1b 100644
--- a/debian/combiner/lists/TeX-MML-AM_HTMLorMML-full.lis
+++ b/debian/combiner/lists/TeX-MML-AM_HTMLorMML-full.lis
@@ -3,6 +3,7 @@ jax/input/MathML/config.js
 jax/input/AsciiMath/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/tex2jax.js
 extensions/mml2jax.js
@@ -22,3 +23,5 @@ jax/input/AsciiMath/jax.js
 jax/output/NativeMML/jax.js
 jax/output/HTML-CSS/jax.js
 jax/output/HTML-CSS/autoload/mtable.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/lists/TeX-MML-AM_HTMLorMML.lis b/debian/combiner/lists/TeX-MML-AM_HTMLorMML.lis
index 57a21e2..a7198f0 100644
--- a/debian/combiner/lists/TeX-MML-AM_HTMLorMML.lis
+++ b/debian/combiner/lists/TeX-MML-AM_HTMLorMML.lis
@@ -3,6 +3,7 @@ jax/input/MathML/config.js
 jax/input/AsciiMath/config.js
 jax/output/HTML-CSS/config.js
 jax/output/NativeMML/config.js
+jax/output/CommonHTML/config.js
 config/MMLorHTML.js
 extensions/tex2jax.js
 extensions/mml2jax.js
@@ -19,3 +20,5 @@ extensions/TeX/AMSmath.js
 extensions/TeX/AMSsymbols.js
 jax/input/MathML/jax.js
 jax/input/AsciiMath/jax.js
+jax/output/CommonHTML/jax.js
+extensions/CHTML-preview.js
diff --git a/debian/combiner/template-unpacked.js b/debian/combiner/template-unpacked.js
index 03659e7..352aa85 100644
--- a/debian/combiner/template-unpacked.js
+++ b/debian/combiner/template-unpacked.js
@@ -5,7 +5,7 @@
  *
  *  %%% NAME %%%
  *  
- *  Copyright (c) 2010-2013 The MathJax Consortium
+ *  Copyright (c) 2010-2015 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 b48e76c..91b6f3f 100644
--- a/debian/combiner/template.js
+++ b/debian/combiner/template.js
@@ -1,7 +1,7 @@
 /*
  *  %%% NAME %%%
  *  
- *  Copyright (c) 2010-2013 The MathJax Consortium
+ *  Copyright (c) 2010-2015 The MathJax Consortium
  *
  *  Part of the MathJax library.
  *  See http://www.mathjax.org for details.
diff --git a/debian/packer/packMJfile b/debian/packer/packMJfile
index 7711622..4697a00 100755
--- a/debian/packer/packMJfile
+++ b/debian/packer/packMJfile
@@ -9,7 +9,11 @@ use Cwd;
 use FindBin;
 
 $bindir = $FindBin::Bin;
-$YUI = "/usr/share/yui-compressor/yui-compressor.jar";
+
+$JAVA = "java";
+$SED = "sed";
+$YUICOMPRESSOR = "/usr/share/yui-compressor/yui-compressor.jar";
+
 $YUIFILTER = "$bindir/yuiFilter";
 $src = shift; $dst = shift;
 
@@ -25,7 +29,7 @@ print "============================================\n";
 print "Compressing: $src\n";
 print "--------------------------------------------";
 # The sed command uncomments the 'MathJax.isPacked = true;' from MathJax.js
-system("cat '$src' | sed \"s\/^.*\\/\\/ \\(MathJax.isPacked = true;\\).*$\/\\1\/\" | java -jar '$YUI' -v -o '$dst' --type js 2>&1 | $YUIFILTER");
+system("cat '$src' | $SED \"s\/^.*\\/\\/ \\(MathJax.isPacked = true;\\).*$\/\\1\/\" | $JAVA -jar '$YUICOMPRESSOR' -v -o '$dst' --type js 2>&1 | $YUIFILTER");
 
 open(MJX,"<", $dst);
 @lines = <MJX>;
diff --git a/debian/packer/template.js b/debian/packer/template.js
index 39c918e..4c92a46 100644
--- a/debian/packer/template.js
+++ b/debian/packer/template.js
@@ -1,7 +1,7 @@
 /*
  *  %%%NAME%%%
  *
- *  Copyright (c) 2009-2013 The MathJax Consortium
+ *  Copyright (c) 2009-2015 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.

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

More information about the Pkg-javascript-commits mailing list