[texlive-bin] 01/02: remove tex4ht.jar building
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-bin.
commit 3d066a831b368ee06cef4430541d53d1abf991ec
Author: Norbert Preining <preining@debian.org>
Date: Wed Aug 9 14:32:46 2017 +0900
remove tex4ht.jar building
---
debian/changelog | 4 +++-
debian/control | 6 +++---
debian/rules | 11 -----------
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 01ebdd3..3f0f301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
texlive-bin (2017.20170613.44572-5) UNRELEASED; urgency=medium
* fix changelog mess-up.
+ * move tex4ht.jar building to src:texlive-extra to allow for
+ bootstrapping (Closes: #870786)
- -- Norbert Preining <preining@debian.org> Tue, 08 Aug 2017 07:55:10 +0900
+ -- Norbert Preining <preining@debian.org> Wed, 09 Aug 2017 14:31:31 +0900
texlive-bin (2017.20170613.44572-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 239e67b..abda44d 100644
--- a/debian/control
+++ b/debian/control
@@ -34,8 +34,7 @@ Build-Depends:
sharutils,
texinfo,
time,
- zlib1g-dev | libz-dev,
- default-jdk
+ zlib1g-dev | libz-dev
Standards-Version: 4.0.1
Homepage: http://www.tug.org/texlive/
Vcs-Git: git://anonscm.debian.org/debian-tex/texlive-bin.git
@@ -62,7 +61,8 @@ Replaces: texlive-metapost (<< 2010), texlive-base (<< 2010), ptex-bin, mendexk,
Conflicts: mendexk, makejvf, jmpost
Breaks: texlive-base (<< 2016), jtex-bin, multex-bin, luatex (<< 2014), tex-common (<< 6), musixtex (<< 1:1.20.ctan20151216-3), pmx (<< 2.7.0.ctan20150301-3), m-tx (<< 0.61.ctan20151217-2), gregorio (<= 2.3-1), context (<< 2016), tex4ht (<< 20160814),
texlive-htmlxml (<< 2016.20160829),
- texlive-lang-japanese (<< 2017)
+ texlive-lang-japanese (<< 2017),
+ texlive-plain-generic (<< 2017.20170809)
Provides: texlive-base-bin, makejvf, mendexk, jmpost, luatex
Description: Binaries for TeX Live
This package contains all the binaries of TeX Live packages.
diff --git a/debian/rules b/debian/rules
index 9e44d96..af83f0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,13 +143,6 @@ override_dh_auto_configure:
--enable-ttf2pk2 \
--enable-ipc
-override_dh_auto_build:
- dh_auto_build
- # build the java classes for tex4ht
- mkdir -p Work/tex4ht-java
- cd texk/tex4htk/java ; javac *.java */*.java */*/*.java -d ../../../Work/tex4ht-java
- cd Work/tex4ht-java ; jar cvf ../tex4ht.jar .
-
override_dh_auto_install:
dh_auto_install -- DESTDIR=$(CURDIR)/debian/tmp
@@ -168,10 +161,6 @@ override_dh_install:
install -m 0755 debian/xdvi-pl debian/texlive-binaries/usr/bin/xdvi
# remove texlive directories, they should not be shipped here
rm -rf debian/texlive-binaries/usr/share/texlive
- # but we ship the tex4ht.jar file here ...
- # install tex4ht.jar
- mkdir -p $(CURDIR)/debian/texlive-binaries/usr/share/texlive/texmf-dist/tex4ht/bin/
- cp Work/tex4ht.jar $(CURDIR)/debian/texlive-binaries/usr/share/texlive/texmf-dist/tex4ht/bin/tex4ht.jar
# remove wrongly added info/dir.gz
rm -f debian/texlive-binaries/usr/share/info/dir*
# remove tlbuild info document, not needed
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git
Reply to: