[Pkg-mediawiki-commits] [mediawiki-math] 02/02: Just build texvc binary package from source
Kunal Mehta
legoktm-guest at moszumanska.debian.org
Mon Jul 11 13:06:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
legoktm-guest pushed a commit to branch master
in repository mediawiki-math.
commit 372ca4ca341fb3602268e064b6e03a0d967371b4
Author: Kunal Mehta <legoktm at member.fsf.org>
Date: Mon Jul 11 04:17:47 2016 -0700
Just build texvc binary package from source
---
debian/Math.php | 3 -
debian/README.Debian | 9 ---
debian/changelog | 10 ++++
debian/compat | 2 +-
debian/control | 61 +++++---------------
debian/copyright | 34 ++++++++++-
debian/docs | 1 -
debian/mediawiki-extensions-math.install | 2 -
debian/mediawiki-extensions-math.links | 1 -
debian/mediawiki-extensions-math.postinst | 65 ----------------------
debian/rules | 2 +-
debian/texvc.1 | 4 +-
debian/{mediawiki-math-texvc.clean => texvc.clean} | 0
...{mediawiki-math-texvc.install => texvc.install} | 0
...ediawiki-math-texvc.manpages => texvc.manpages} | 0
15 files changed, 62 insertions(+), 132 deletions(-)
diff --git a/debian/Math.php b/debian/Math.php
deleted file mode 100644
index 06e08f9..0000000
--- a/debian/Math.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-require_once("$IP/extensions/Math/Math.php");
-$wgTexvc = "/usr/bin/texvc";
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index deb15cd..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-mediawiki-math for Debian
--------------------------
-If mediawiki-extensions-base is installed, use the mwenext and mwdisext
-to enable/disable this extension.
-
-Otherwise, see http://www.mediawiki.org/wiki/Extension:Math for the required
-configuration.
-
- -- Jonathan Wiltshire <jmw at debian.org> Tue, 29 May 2012 23:05:14 +0100
diff --git a/debian/changelog b/debian/changelog
index 5737700..4482ded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mediawiki-math (2:3.0.0+git20160613-1) unstable; urgency=medium
+
+ * Reintroduce into Debian (Closes: #830780)
+ * Rename mediawiki-math-texvc package to just texvc
+ * Update to latest upstream release
+ * Update standards version 3.9.8
+ * Update to debhelper compat 9
+
+ -- Kunal Mehta <legoktm at member.fsf.org> Mon, 11 Jul 2016 04:15:18 -0700
+
mediawiki-math (2:1.0+git20120528-8) unstable; urgency=low
* Team upload
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 194c985..890b4a8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,63 +2,32 @@ Source: mediawiki-math
Section: web
Priority: optional
Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
-Uploaders: Jonathan Wiltshire <jmw at debian.org>
-Build-Depends: debhelper (>= 8.0.0),
+Uploaders: Jonathan Wiltshire <jmw at debian.org>, Kunal Mehta <legoktm at member.fsf.org>
+Build-Depends: debhelper (>= 9),
ocaml-nox | ocaml,
xsltproc,
docbook-xml,
docbook-xsl
-Standards-Version: 3.9.4
+Standards-Version: 3.9.8
Homepage: http://www.mediawiki.org/wiki/Extension:Math
Vcs-Git: git://anonscm.debian.org/collab-maint/mediawiki-math.git
Vcs-Browser: http://anonscm.debian.org/git/collab-maint/mediawiki-math.git
-Package: mediawiki-extensions-math
-Architecture: all
-Depends: mediawiki (>= 1:1.18), mediawiki-math-texvc (>= 2:1.0), ${misc:Depends}
-Recommends: mediawiki-extensions-base
-Description: math rendering plugin for MediaWiki (common files)
- MediaWiki is a wiki engine (a program for creating a collaboratively edited
- website). It is designed to handle heavy websites containing library-like
- document collections, and supports user uploads of images/sounds, multilingual
- content, TOC autogeneration, ISBN links, etc.
- .
- Moreover, it keeps track of changes, so users can receive notifications, view
- diffs and revert edits. This system has many other features and can easily be
- extended.
- .
- This package contains the architecture-independent files for the math rendering
- plugin.
-
-Package: mediawiki-math-texvc
+Package: texvc
Architecture: any
Depends: ${interpreter:Depends}, ${shlibs:Depends},
texlive-latex-base, ghostscript, imagemagick, texlive-latex-extra,
${misc:Depends}
-Recommends: mediawiki-extensions-math, latex-cjk-all
-Conflicts: mediawiki-math (<< 1:1.18)
-Replaces: mediawiki-math (<< 1:1.18)
-Description: math rendering plugin for MediaWiki (texvc binary files)
- MediaWiki is a wiki engine (a program for creating a collaboratively edited
- website). It is designed to handle heavy websites containing library-like
- document collections, and supports user uploads of images/sounds, multilingual
- content, TOC autogeneration, ISBN links, etc.
+Recommends: latex-cjk-all
+Enhances: mediawiki
+Conflicts: mediawiki-math (<< 1:1.18), mediawiki-math-texvc
+Replaces: mediawiki-math (<< 1:1.18), mediawiki-math-texvc
+Description: validates and converts LaTeX expressions into HTML, MathML or PNG
+ texvc takes LaTeX-compatible equations and produces formatted output in HTML,
+ MathML, and (via LaTeX/dvipng) rasterized PNG images.
.
- Moreover, it keeps track of changes, so users can receive notifications, view
- diffs and revert edits. This system has many other features and can easily be
- extended.
- .
- This package contains the texvc binary required by the math rendering plugin.
-
-Package: mediawiki-math
-Section: oldlibs
-Priority: extra
-Architecture: any
-Depends: mediawiki-extensions-math, ${misc:Depends}
-Description: math rendering plugin for MediaWiki (transitional package)
- MediaWiki is a wiki engine (a program for creating a collaboratively edited
- website). It is designed to handle heavy websites containing library-like
- document collections, and supports user uploads of images/sounds, multilingual
- content, TOC autogeneration, ISBN links, etc.
+ Input data is parsed and scrutinized for safety, and the output includes an
+ estimate of whether the code is simple enough that HTML rendering will look
+ acceptable.
.
- This is a transitional package and can safely be removed.
+ texvc was written for math support in MediaWiki, but can be used standalone.
diff --git a/debian/copyright b/debian/copyright
index 614247f..5cfc41e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: mediawiki-math
Source: http://www.mediawiki.org/wiki/Extension:Math
Files: *
-Copyright: 2002-2011 various MediaWiki contributors
+Copyright: 2002-2016 various MediaWiki contributors
License: GPL-2.0
License: GPL-2.0
@@ -24,6 +24,7 @@ License: GPL-2.0
Files: debian/*
Copyright: 2012 Jonathan Wiltshire <jmw at debian.org>
+ 2016 Kunal Mehta <legoktm at member.fsf.org>
License: GPL-2.0
Files: debian/texvc.xml
@@ -46,3 +47,34 @@ License: GPL-2.0+
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: modules/ve-math/*
+Copyright: 2011-2015 VisualEditor Team and others
+License: Expat
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom
+ the Software is furnished to do so, subject to the following
+ conditions:
+ .
+ The above copyright notice and this permission notice shall
+ be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 289707a..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-mathParserTests.txt
diff --git a/debian/mediawiki-extensions-math.install b/debian/mediawiki-extensions-math.install
deleted file mode 100644
index d13f8be..0000000
--- a/debian/mediawiki-extensions-math.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/Math.php etc/mediawiki-extensions/extensions-available/
-Math.php db Math.body.php Math.hooks.php Math.i18n.php mathParserTests.txt usr/share/mediawiki-extensions/math/
diff --git a/debian/mediawiki-extensions-math.links b/debian/mediawiki-extensions-math.links
deleted file mode 100644
index d5fea02..0000000
--- a/debian/mediawiki-extensions-math.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/mediawiki-extensions/math var/lib/mediawiki/extensions/Math
diff --git a/debian/mediawiki-extensions-math.postinst b/debian/mediawiki-extensions-math.postinst
deleted file mode 100644
index 3ce427a..0000000
--- a/debian/mediawiki-extensions-math.postinst
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# From MirOS: contrib/hosted/tg/deb/jupp/debian/jupp.postinst,v 1.11 2011/10/06 08:59:57 tg Exp $
-
-set -e
-
-# This maintainer script can be called the following ways:
-#
-# * new-postinst "configure" [$most_recently_configured_version]
-# The package is unpacked; all dependencies are unpacked and, when there
-# are no circular dependencies, configured.
-#
-# * old-postinst "abort-upgrade" $new_version
-# * conflictors-postinst "abort-remove" "in-favour" $package
-# $new_version
-# * postinst "abort-remove"
-# * deconfigureds-postinst "abort-deconfigure" "in-favour"
-# $failed_install_package $fip_version ["removing"
-# $conflicting_package $cp_version]
-# The package is unpacked; all dependencies are at least Half-Installed,
-# previously been configured, and not removed. In some error situations,
-# dependencies may not be even fully unpacked.
-#
-# * postinst "triggered" "${triggers[*]}"
-# For trigger-only calls, i.e. if "configure" is not called.
-
-check_move_dir() {
- local _src=/usr/share/mediawiki-extensions/math
- local _dst=/var/lib/mediawiki/extensions/Math
-
- test -h $_dst && return 0
- test -e $_dst && if test -d $_dst; then
- rmdir $_dst
- else
- rm $_dst
- fi
- if test -e $_dst; then
- echo >&2 Some error removing $_dst
- exit 1
- fi
- ln -s $_src $_dst
-}
-
-case $1 in
-configure)
- check_move_dir
- ;;
-
-abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
-triggered)
- ;;
-
-*)
- echo >&2 "postinst called with unknown subcommand '$1'"
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index f3f757d..6876446 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ override_dh_shlibdeps:
# otherwise dh_prep nobbles it
dh_shlibdeps
if [ ! -x /usr/bin/ocamlopt ]; then \
- echo "interpreter:Depends=ocaml-base-nox" >> debian/mediawiki-math-texvc.substvars;\
+ echo "interpreter:Depends=ocaml-base-nox" >> debian/texvc.substvars;\
fi
%:
diff --git a/debian/texvc.1 b/debian/texvc.1
index 933b41b..573944b 100644
--- a/debian/texvc.1
+++ b/debian/texvc.1
@@ -1,7 +1,7 @@
'\" t
.\" Title: TEXVC
.\" Author: Marc Dequ\e[`e]nes
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 2005-01-02
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
@@ -244,7 +244,7 @@ with the following codes:
.SH "AUTHOR"
.PP
This manual page was written by Marc Dequ\e[`e]nes (Duck)
-Duck at DuckCorp\&.org
+<Duck at DuckCorp\&.org>
for the
Debian(TM)
system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the
diff --git a/debian/mediawiki-math-texvc.clean b/debian/texvc.clean
similarity index 100%
rename from debian/mediawiki-math-texvc.clean
rename to debian/texvc.clean
diff --git a/debian/mediawiki-math-texvc.install b/debian/texvc.install
similarity index 100%
rename from debian/mediawiki-math-texvc.install
rename to debian/texvc.install
diff --git a/debian/mediawiki-math-texvc.manpages b/debian/texvc.manpages
similarity index 100%
rename from debian/mediawiki-math-texvc.manpages
rename to debian/texvc.manpages
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/mediawiki-math.git
More information about the Pkg-mediawiki-commits
mailing list