summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/flex-doc.doc-base3
-rw-r--r--debian/flex-doc.docs1
-rw-r--r--debian/flex.doc-base3
-rw-r--r--debian/flex.docs1
-rwxr-xr-xdebian/rules1
6 files changed, 10 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 0f0377c..cccd1ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,14 @@ flex (2.5.39-8) unstable; urgency=low
* 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>
* Bug fix #752151: "pdfetex error about missing cm-super", thanks to
Helmut Grohne and Cyril Brulebois
- -- Manoj Srivastava <srivasta@debian.org> Fri, 20 Jun 2014 20:45:09 -0700
+ -- Manoj Srivastava <srivasta@debian.org> Fri, 20 Jun 2014 20:52:43 -0700
flex (2.5.39-7) unstable; urgency=low
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),' \