Hi, Here's a new set of patches which simplifies the changes a lot: Andreas Metzler, Johannes Schauer and Helmut Grohne gave me the idea that since TeX Live is only used to build an arch:all documentation package, it may be moved to Build-Depends-Indep and so not used in the bootstrapping builds for new architectures.
So the first patch is the same (move the PDF file to flex-doc so that the binary package build is the same whether we build docs or not), but the second one is much, much simpler and now no <!profile.*> or Build-Profiles modifications are needed to debian/control at all. Hence I'm closing #749470, the control file needs no modifications and all the needed changes may be uploaded right now. BTW, I am not quite sure what to do about the third patch. It is not specific to bootstrapping, rather it addresses a FTBFS for flex-doc with TeX Live 2014 that hit unstable recently: the pdftex utility now wants to use a font that has been split off into a new package. So now there are three possible ways to go: - declare a B-D-I of src:flex on cm-super-minimal - declare a B-D-I of src:flex on texlive-full that pulls in cm-super-minimal - talk to the Debian TeX maintainers to figure out how to address this better, since it seems to not be limited to flex (see e.g. #750252 for autoconf) G'luck, Peter -- Peter Pentchev r...@ringlet.net r...@freebsd.org p.penc...@storpool.com PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13
From 7002300b5f12a333bfbb037a1e712b28ba207a8a Mon Sep 17 00:00:00 2001
From: Peter Pentchev <r...@ringlet.net>
Date: Thu, 22 May 2014 15:40:10 +0300
Subject: [PATCH 1/3] Move flex.pdf to the flex-doc package.
This makes it possible for the flex package's contents to not change
if texinfo is not installed, e.g. in the stage1 build profile.
---
debian/flex-doc.doc-base | 3 +++
debian/flex-doc.docs | 1 +
debian/flex.doc-base | 3 ---
debian/flex.docs | 1 -
debian/rules | 1 +
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/flex-doc.doc-base b/debian/flex-doc.doc-base
index 8ff5df1..e05bcbc 100644
--- a/debian/flex-doc.doc-base
+++ b/debian/flex-doc.doc-base
@@ -18,3 +18,6 @@ Section: Programming
Format: HTML
Index: /usr/share/doc/flex-doc/html/index.html
Files: /usr/share/doc/flex-doc/html/*.html
+
+Format: PDF
+Files: /usr/share/doc/flex-doc/flex.pdf.gz
diff --git a/debian/flex-doc.docs b/debian/flex-doc.docs
index e554789..8bd1921 100644
--- a/debian/flex-doc.docs
+++ b/debian/flex-doc.docs
@@ -1,2 +1,3 @@
README
doc/flex.html/
+doc/flex.pdf
diff --git a/debian/flex.doc-base b/debian/flex.doc-base
index a54defa..89e9529 100644
--- a/debian/flex.doc-base
+++ b/debian/flex.doc-base
@@ -15,9 +15,6 @@ Abstract: Fast LEXical analyzer generator
finds one, it executes the corresponding C code.
Section: Programming
-Format: PDF
-Files: /usr/share/doc/flex/flex.pdf.gz
-
Format: info
Index: /usr/share/info/flex.info.gz
Files: /usr/share/info/flex.info-1.gz /usr/share/info/flex.info-2.gz
diff --git a/debian/flex.docs b/debian/flex.docs
index 33dca26..b5a2dc0 100644
--- a/debian/flex.docs
+++ b/debian/flex.docs
@@ -7,4 +7,3 @@ ABOUT-NLS
AUTHORS
debian/README.Debian
debian/NEWS.Debian
-doc/flex.pdf
diff --git a/debian/rules b/debian/rules
index a27811c..545b173 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ override_dh_install:
find debian/tmp/lib/$(DEB_HOST_MULTIARCH) -type f \
-name \*.la -exec rm {} \;
dh_install
+ rm -f debian/flex/usr/share/doc/flex/flex.pdf
ifneq (,$(filter libfl-dev, $(shell dh_listpackages)))
$(make_directory) debian/libfl-dev/usr/lib
sed -e 's,#DEB_HOST_MULTIARCH#,$(DEB_HOST_MULTIARCH),' \
--
2.0.0
From db711f3438d41c17577237eda2b35ecf847e3cc6 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <r...@ringlet.net> Date: Wed, 11 Jun 2014 12:41:27 +0300 Subject: [PATCH 2/3] Move the flex-doc build dependencies to B-D-I. Move the TeX Live dependencies to Build-Depends-Indep and only build the HTML and PDF documentation if actually requested. This breaks a circular build dependency by not requiring texlive for the build of the arch-dependent flex binary packages. --- debian/control | 4 ++-- debian/rules | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index fe447c5..107a1d8 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Section: devel Homepage: http://flex.sf.net/ Priority: optional Build-Depends: bison, gettext, texinfo, help2man, file, po-debconf, - debhelper (>= 9.0.0), dh-autoreconf, texlive-latex-base, - texlive-fonts-recommended, dpkg-dev (>= 1.16.0) + debhelper (>= 9.0.0), dh-autoreconf, dpkg-dev (>= 1.16.0) +Build-Depends-Indep: texlive-latex-base, texlive-fonts-recommended Maintainer: Manoj Srivastava <sriva...@debian.org> Standards-Version: 3.9.5 diff --git a/debian/rules b/debian/rules index 545b173..029e492 100755 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,7 @@ override_dh_auto_configure: fi; \ fi dh_auto_configure -- --prefix=$(PREFIX) $(confflags) + sed -i -e 's/^dist_doc_DATA[[:space:]]*=.*/dist_doc_DATA=/' doc/Makefile override_dh_install: test ! -d debian/tmp/lib/$(DEB_HOST_MULTIARCH) || \ @@ -64,7 +65,9 @@ endif override_dh_auto_build: dh_auto_build - $(MAKE) -C doc flex.info flex.html +ifneq (,$(filter flex-doc, $(shell dh_listpackages))) + $(MAKE) -C doc flex.html flex.pdf +endif bash -n debian/flex-doc.postinst bash -n debian/flex-doc.prerm bash -n debian/flex.postinst -- 2.0.0
From 6763c22d8684d8248cfd2924427adba6a654dca3 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <r...@ringlet.net> Date: Wed, 11 Jun 2014 12:44:55 +0300 Subject: [PATCH 3/3] TeX Live's pdfTeX requires cm-super-minimal now. The build of the PDF file fails with TeX Live 2014. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 107a1d8..c0044fa 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ Homepage: http://flex.sf.net/ Priority: optional Build-Depends: bison, gettext, texinfo, help2man, file, po-debconf, debhelper (>= 9.0.0), dh-autoreconf, dpkg-dev (>= 1.16.0) -Build-Depends-Indep: texlive-latex-base, texlive-fonts-recommended +Build-Depends-Indep: texlive-latex-base, texlive-fonts-recommended, + cm-super-minimal Maintainer: Manoj Srivastava <sriva...@debian.org> Standards-Version: 3.9.5 -- 2.0.0
signature.asc
Description: Digital signature
