[texlive-nonbin] 01/03: fix some lintian errors (jquery, texlive-binaries version, description)
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit 2c6e4a811730fe3ee5980303e9a48f82d42ad131
Author: Norbert Preining <preining@debian.org>
Date: Thu Aug 21 17:31:42 2014 +0900
fix some lintian errors (jquery, texlive-binaries version, description)
---
all/debian/fix-jquery-inclusion | 22 ++++++++++++++++++++++
all/debian/rules.in | 1 +
all/debian/tpm2deb.cfg | 11 ++++++++++-
tpm2deb-source.pl | 2 +-
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/all/debian/fix-jquery-inclusion b/all/debian/fix-jquery-inclusion
new file mode 100644
index 0000000..ff5c424
--- /dev/null
+++ b/all/debian/fix-jquery-inclusion
@@ -0,0 +1,22 @@
+#
+# fix-jquery-inclusion
+# (c) 2014 Norbert Preining
+#
+# try to fix jquery.js duplication
+#
+
+pkg="$1"
+
+lua2doxfiles="
+ usr/share/doc/texlive-doc/support/lua2dox/docs/html/jquery.js
+ usr/share/doc/texlive-doc/support/lua2dox/examples/lua/docs/html/jquery.js
+ usr/share/doc/texlive-doc/support/lua2dox/examples/php/docs/html/jquery.js
+"
+
+for f in $lua2doxfiles ; do
+ ff="debian/$pkg/$f"
+ if [ -r $ff ] ; then
+ ln -sf /usr/share/javascript/jquery/jquery.js $ff
+ fi
+done
+
diff --git a/all/debian/rules.in b/all/debian/rules.in
index d2a233a..b8435f6 100755
--- a/all/debian/rules.in
+++ b/all/debian/rules.in
@@ -42,6 +42,7 @@ install-stamp: build-stamp
for i in $(PACKAGES) $(METAPACKAGES) ; do \
bash debian/generate-license-file $$i ; \
bash debian/fix-privacy-breach $$i ; \
+ bash debian/fix-jquery-inclusion $$i ; \
if [ -r debian/$$i.links.dist ] ; then cat debian/$$i.links.dist >> debian/$$i.links ; fi ; \
done
<: if ($srcpackage eq "texlive-base") { _:>//
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 6c710fc..ec7b50a 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -11,7 +11,7 @@
# we have to keep texlive-bin here so that we can change the dependency
# on texlive-binaries for packages:
source;texlive-bin
-latest-version;texlive-bin;2014.20140512
+latest-version;texlive-bin;2014.20140512.33982
name;collection-foobar;texlive-binaries;texlive-bin
# sources
source;texlive-base
@@ -188,6 +188,11 @@ depends;texlive-pictures;texlive-latex-recommended
# same for luatex via pmxchords
depends;texlive-music;python
#
+# more pythons
+#
+depends;texlive-science;python
+depends;texlive-extra-utils;python
+#
# biber - biblatex coordination
#
breaks;texlive-bibtex-extra;biber (<< 1.8)
@@ -209,6 +214,10 @@ recommends;texlive-publishers;texlive-latex-extra
suggests;texlive-latex-recommended;texlive-pstricks
#
+# jquery fiddling
+depends;texlive-luatex;libjs-jquery
+
+#
# Additional packages, no tpms/collections exist
include-config;cfg.d/additional-packages.cfg
diff --git a/tpm2deb-source.pl b/tpm2deb-source.pl
index 12deb44..ad22113 100755
--- a/tpm2deb-source.pl
+++ b/tpm2deb-source.pl
@@ -708,7 +708,7 @@ sub get_arch {
# Formats
#
format CONTROL =
-~~^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+~^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
$shortl
.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: