diff options
| author | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-06-20 21:01:27 -0700 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-06-20 21:01:27 -0700 |
| commit | d7b859a063a26d2b72592ac238f7915d8ff797b3 (patch) | |
| tree | b7b09cd08efda56516067f62dc2d49091522d115 | |
| parent | cdb2ef615a96603622246d8fa7525bcb04f80a65 (diff) | |
[master]: Build dependency fixes, no code change
Added a missing build depends on vm-super-minimal, reuired fro building
the pdf documentation, (Closes: #752151).
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. Thanks to Peter Pentchev
<roam@ringlet.net>
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. (Closes: #749344).
Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index cccd1ee..c0f8d12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,10 +6,17 @@ flex (2.5.39-8) unstable; urgency=low flex package's contents to not change if texinfo is not installed, e.g. in the stage1 build profile. Thanks to Peter Pentchev <roam@ringlet.net> + * 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. (Closes: #749344). * Bug fix #752151: "pdfetex error about missing cm-super", thanks to Helmut Grohne and Cyril Brulebois + * Bug fix: #749344" Allow bootstrapping without texlive and + dh-autoreconf", thanks to Peter Pentchev - -- Manoj Srivastava <srivasta@debian.org> Fri, 20 Jun 2014 20:52:43 -0700 + -- Manoj Srivastava <srivasta@debian.org> Fri, 20 Jun 2014 20:58:31 -0700 flex (2.5.39-7) unstable; urgency=low diff --git a/debian/control b/debian/control index 0c4b437..a6e8bf1 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), cm-super-minimal + debhelper (>= 9.0.0), dh-autoreconf, dpkg-dev (>= 1.16.0) +Build-Depends-Indep: texlive-latex-base, texlive-fonts-recommended, cm-super-minimal Maintainer: Manoj Srivastava <srivasta@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 |