[texlive-nonbin] 01/01: rework for tex4ht.jar inclusion, release new tl-extra
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit 4423aae63250931622b674db9e345ceb0415d54c
Author: Norbert Preining <preining@debian.org>
Date: Thu Aug 10 08:02:33 2017 +0900
rework for tex4ht.jar inclusion, release new tl-extra
---
README | 11 +++++++++++
all/debian/rules.in | 9 +++++++++
all/debian/tpm2deb.cfg | 9 ++++++---
all/debian/tpm2debcommon.pm | 4 ++++
do-one | 13 +++++++++----
texlive-extra/debian/changelog | 7 +++++++
tpm2deb-source.pl | 9 +++++++++
7 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/README b/README
index d8c76a1..d4186f9 100644
--- a/README
+++ b/README
@@ -343,6 +343,17 @@ blacklist;file;<origfilename>
file name in UPSTREAM source (as listed in tpm files).
It is a perl regexp!!!!
Otherwise works as above.
+kill;<origfilename>
+ included in .orig.tar.gz
+ not installed
+ignore;<origfilename>
+ included in .orig.tar
+ not installed
+ BUT post actions done!
+notinorig;<origfilename>
+ not included in .orig.tar
+ BUT installed
+ needs to be build in a different way (currently only tex4ht.jar!)
special;<filename>;<tag>
currently only allowed for <tag> is "install-info"
which installs the file <filename> via pkg.info and dh_installinfo
diff --git a/all/debian/rules.in b/all/debian/rules.in
index f38a3e3..500a9bc 100644
--- a/all/debian/rules.in
+++ b/all/debian/rules.in
@@ -14,6 +14,12 @@ build-arch: build-stamp
build-indep: build-stamp
build-stamp:
+ifelse(_srcpackage_,texlive-extra,<:
+ mkdir tex4ht-java
+ mkdir -p texmf-dist/tex4ht/bin
+ cd tex4ht ; javac *.java */*.java */*/*.java -d ../tex4ht-java
+ cd tex4ht-java ; jar cvf ../texmf-dist/tex4ht/bin/tex4ht.jar .
+:>)
touch build-stamp
clean:
@@ -26,6 +32,9 @@ clean:
ifelse(_srcpackage_,texlive-base,<:
rm -f debian/texlive-base.cnf
:>)
+ifelse(_srcpackage_,texlive-extra,<:
+ rm -rf tex4ht-java texmf-dist/tex4ht/bin/tex4ht.jar
+:>)
# texlive contains some .orig files we need to keep otherwise
# the copy will fail due to the files occurring in the tlpdb
dh_clean -X.orig -X.bak
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index f3c9611..3ae290b 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -172,6 +172,9 @@ replaces;texlive-plain-generic;tex4ht (<< 20160814)
provides;texlive-plain-generic;tex4ht
breaks;texlive-plain-generic;tex4ht (<< 20160814)
conflicts;texlive-plain-generic;tex4ht (<< 20160814), tex4ht-common
+# tex4ht.jar also moved from texlive-binaries to texlive-plain-generic
+replaces;texlive-plain-generic;texlive-binaries (<< 2017.20170613.44572-5)
+conflicts;texlive-plain-generic;texlive-binaries (<< 2017.20170613.44572-5)
#
replaces;texlive-formats-extra;xmltex (<< 1.9.debian.1-6), jadetex (<< 3.13-17)
provides;texlive-formats-extra;xmltex, jadetex
@@ -276,7 +279,7 @@ build-dep;texlive-lang;debhelper (>= 9)
build-dep-indep;texlive-lang;sharutils, tex-common (>= 6), findutils (>=4.2.0)
# texlive-extra
build-dep;texlive-extra;debhelper (>= 9)
-build-dep-indep;texlive-extra;sharutils, tex-common (>= 6), findutils (>=4.2.0)
+build-dep-indep;texlive-extra;sharutils, tex-common (>= 6), findutils (>=4.2.0), default-jdk
#
#
# MOVE PACKAGES
@@ -394,8 +397,8 @@ kill;texmf-dist/doc/man/man1/texconfig.man1.pdf;;
kill;texmf-dist/doc/man/man1/texconfig-sys.1;;
kill;texmf-dist/doc/man/man1/texconfig-sys.man1.pdf;;
#
-# kill tx4ht.jar
-kill;texmf-dist/tex4ht/bin/tex4ht.jar;;
+# do not include tex4ht.jar in orig.tar it is built!
+notinorig;texmf-dist/tex4ht/bin/tex4ht.jar;;
#
#
include-config;cfg.d/info-man-handling.cfg
diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index ebbe4d0..82ccd91 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -636,6 +636,10 @@ sub read_one_config_file {
push @{$TeXLive{'all'}{'kill'}}, $a;
next;
}
+ if ($type eq "notinorig") {
+ push @{$TeXLive{'all'}{'notinorig'}}, $a;
+ next;
+ }
if ($type eq "blacklist") {
if ($a eq "file") {
my ($b) = @rest;
diff --git a/do-one b/do-one
index 87fb54c..d2b432f 100644
--- a/do-one
+++ b/do-one
@@ -1,17 +1,22 @@
#set -x
pkg=$1
-
-perl tpm2deb-source.pl --master=/home/norbert/public_html/tlnet make-orig-tar $pkg
-
# for in-system builds:
cd $pkg
version=$(dpkg-parsechangelog | grep ^Version | awk '{print$2}')
cd ..
-
upversion=$(echo $version | sed -e 's/-.*$//')
debrevision=$(echo $version | sed -e 's/^.*-//')
+if [ $debrevision = 1 ] ; then
+ perl tpm2deb-source.pl --master=/home/norbert/public_html/tlnet make-orig-tar $pkg
+ if [ $pkg = texlive-extra ] ; then
+ tar -cvf texlive-extra_$upversion.orig-tex4ht.tar \
+ --directory=/home/norbert/Development/TeX/debian/git/texlive-bin/texk/tex4htk/java .
+ xz -9 texlive-extra_$upversion.orig-tex4ht.tar
+ fi
+fi
+
perl tpm2deb-source.pl --noremove --nosrcpkg make-deb-source $pkg
cd ${pkg}-$upversion
dpkg-buildpackage -us -uc -rfakeroot
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index 4f5d6c9..2ef2533 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,3 +1,10 @@
+texlive-extra (2017.20170809-1) unstable; urgency=medium
+
+ * include tex4ht jar building from texlive-binaries to allow
+ for bootstrapping of texlive-binaries
+
+ -- Norbert Preining <preining@debian.org> Wed, 09 Aug 2017 14:33:53 +0900
+
texlive-extra (2017.20170808-1) unstable; urgency=medium
[ Gregor Herrmann ]
diff --git a/tpm2deb-source.pl b/tpm2deb-source.pl
index c7b7989..c41fe9c 100755
--- a/tpm2deb-source.pl
+++ b/tpm2deb-source.pl
@@ -254,6 +254,10 @@ sub make_orig_tar {
for my $f (@{$TeXLive{'all'}{'file_blacklist'}}) {
`rm -f \"$texlivedest/$f\"`;
}
+ # remove those files that should not appear in the .orig but might still be installed
+ for my $f (@{$TeXLive{'all'}{'notinorig'}}) {
+ `rm -f \"$texlivedest/$f\"`;
+ }
# remove binary files
`rm -rf \"$texlivedest/bin\"`;
#
@@ -413,6 +417,11 @@ sub make_deb_source {
if ($sourcedone) {
print "Reusing $oldorig file for source package building!\n";
system("tar -xf $oldorig") == 0 or die("Error untarring");
+ if ($package eq "texlive-extra") {
+ my $extraorig = $oldorig;
+ $extraorig =~ s/\.orig\./\.orig-tex4ht\./;
+ system("mkdir ${package}-${version}/tex4ht && tar -C ${package}-${version}/tex4ht -xf $extraorig") == 0 or die("Cannot untar $extraorig, missing?");
+ }
} else {
die("Please create a .orig.tar.xz first!\n");
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: