[Pkg-javascript-commits] [mathjax] 01/01: Update to newer versions of packer and combiner scripts.
Dmitry Shachnev
mitya57-guest at moszumanska.debian.org
Wed Feb 12 12:52:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
mitya57-guest pushed a commit to branch master
in repository mathjax.
commit c7ce919e4c87cffb17a97a767a53301a88864580
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Feb 12 16:52:36 2014 +0400
Update to newer versions of packer and combiner scripts.
---
debian/README.source | 3 ++-
debian/changelog | 1 +
debian/combiner/lists/Accessible-full.lis | 2 +-
debian/combiner/lists/Accessible.lis | 2 +-
debian/combiner/template-unpacked.js | 2 +-
debian/combiner/template.js | 2 +-
debian/copyright | 2 +-
debian/packer/packMJfile | 4 ++--
debian/packer/template-MathJax.js | 30 ------------------------------
debian/packer/template.js | 17 ++++++++++-------
10 files changed, 20 insertions(+), 45 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 2b664db..66e4881 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -7,4 +7,5 @@ The Debian modifications are:
* Use Debian yui-compressor path (`/usr/share/yui-compressor/yui-compressor.jar`)
in `packer/packMJfile`;
-* Replace current working directory in MathJax with `MathJax` string.
+* Replace current working directory in MathJax with `MathJax` string;
+* Do not require the configuration script.
diff --git a/debian/changelog b/debian/changelog
index 8111c6b..4d81854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mathjax (2.3-1) UNRELEASED; urgency=low
* New upstream release.
* Update debian/copyright for new bundled fonts.
+ * Update to newer versions of packer and combiner scripts.
-- Dmitry Shachnev <mitya57 at gmail.com> Fri, 24 Jan 2014 23:51:09 +0400
diff --git a/debian/combiner/lists/Accessible-full.lis b/debian/combiner/lists/Accessible-full.lis
index e08cbea..cfc3dd9 100644
--- a/debian/combiner/lists/Accessible-full.lis
+++ b/debian/combiner/lists/Accessible-full.lis
@@ -26,6 +26,6 @@ menuSettings: {
mpMouse: true
},
errorSettings: {
- message: ["[Math Error]"]
+ message: ["[",["MathError","Math Error"],"]"]
}
diff --git a/debian/combiner/lists/Accessible.lis b/debian/combiner/lists/Accessible.lis
index ac52aa3..8b8dc11 100644
--- a/debian/combiner/lists/Accessible.lis
+++ b/debian/combiner/lists/Accessible.lis
@@ -23,6 +23,6 @@ menuSettings: {
mpMouse: true
},
errorSettings: {
- message: ["[Math Error]"]
+ message: ["[",["MathError","Math Error"],"]"]
}
diff --git a/debian/combiner/template-unpacked.js b/debian/combiner/template-unpacked.js
index 9144546..aee3396 100644
--- a/debian/combiner/template-unpacked.js
+++ b/debian/combiner/template-unpacked.js
@@ -1,7 +1,7 @@
/*
* %%% NAME %%%
*
- * Copyright (c) 2010-11 Design Science, Inc.
+ * Copyright (c) 2010-2013 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 7fc5f34..b48e76c 100644
--- a/debian/combiner/template.js
+++ b/debian/combiner/template.js
@@ -1,7 +1,7 @@
/*
* %%% NAME %%%
*
- * Copyright (c) 2010-11 Design Science, Inc.
+ * Copyright (c) 2010-2013 The MathJax Consortium
*
* Part of the MathJax library.
* See http://www.mathjax.org for details.
diff --git a/debian/copyright b/debian/copyright
index 866aaab..dcdb57c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -57,7 +57,7 @@ License: Apache-2.0
Files: debian/packer/*
debian/combiner/*
-Copyright: 2009-2012 The MathJax Consortium
+Copyright: 2009-2013 The MathJax Consortium
License: Apache-2.0
License: Apache-2.0
diff --git a/debian/packer/packMJfile b/debian/packer/packMJfile
index 9e462ee..d7e3b19 100755
--- a/debian/packer/packMJfile
+++ b/debian/packer/packMJfile
@@ -24,7 +24,8 @@ if ($src =~ m!/config/(local/local|default)\.js$!) {
print "============================================\n";
print "Compressing: $src\n";
print "--------------------------------------------";
-system("java -jar '$YUI' -v -o '$dst' '$src' 2>&1 | $YUIFILTER");
+# The sed command uncomments the 'MathJax.isPacked = true;' from MathJax.js
+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>;
@@ -32,7 +33,6 @@ close(MJX);
$compressed = join("", at lines);
$template = "$bindir/template.js";
-$template = "$bindir/template-MathJax.js" if $dst =~ m!(^|/)MathJax\.js$!;
open(MJX,"<",$template);
@lines = <MJX>;
diff --git a/debian/packer/template-MathJax.js b/debian/packer/template-MathJax.js
deleted file mode 100644
index abcbf83..0000000
--- a/debian/packer/template-MathJax.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************
- *
- * MathJax.js
- *
- * The main code for the MathJax math-typesetting library. See
- * http://www.mathjax.org/ for details.
- *
- * ---------------------------------------------------------------------
- *
- * Copyright (c) 2009-2012 Design Science, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-if (!window.MathJax) {window.MathJax = {}}
-
-MathJax.isPacked = true;
-
-%%%DATA%%%
-
diff --git a/debian/packer/template.js b/debian/packer/template.js
index 0d90f3b..39c918e 100644
--- a/debian/packer/template.js
+++ b/debian/packer/template.js
@@ -1,16 +1,19 @@
/*
* %%%NAME%%%
- *
- * Copyright (c) 2012 Design Science, Inc.
*
- * Part of the MathJax library.
- * See http://www.mathjax.org for details.
- *
- * Licensed under the Apache License, Version 2.0;
+ * Copyright (c) 2009-2013 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.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
%%%DATA%%%
-
--
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