Disable creating pdf documentation

diff --git a/debian/changelog b/debian/changelog
index 56195db6d12e0be438e7479f3ed87060d5633a59..247f0a260e4692bf6bf784333e297488a02e9156 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 lilo (1:23.2-4) unstable; urgency=low
 
   * Enable use of linux 3.x in liloconfig script.
+  * Disable creating pdf documentation.  (Closes: #666320)
+  * Remove build dependency to texlive-latex-base.
 
  -- Joachim Wiedorn <ad_debian@joonet.de>  Sat, 14 Apr 2012 22:56:42 +0200
 

diff --git a/debian/control b/debian/control
index 2ccd5a05209d4df4f5346bb7796f1c330d2cb932..276c5bb0f8a67fd4ed2884a77b32bb3a1c9ede09 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: lilo
 Section: admin
 Priority: optional
 Maintainer: Joachim Wiedorn <ad_debian@joonet.de>
-Build-Depends: debhelper (>= 8), transfig, 
- texlive-latex-base, bin86 (>= 0.16), sharutils, 
+Build-Depends: debhelper (>= 8),
+ transfig, bin86 (>= 0.16), sharutils,
  po-debconf (>= 0.5.0), libdevmapper-dev
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes

diff --git a/debian/patches/18_do-not-create-pdfs.patch b/debian/patches/18_do-not-create-pdfs.patch
new file mode 100644 (file)
index 0000000..d639c74
--- /dev/null
+++ b/debian/patches/18_do-not-create-pdfs.patch
@@ -0,0 +1,62 @@
+Package:     lilo
+Subject:     do not create pdf documentation
+Author:      Joachim Wiedorn <ad_debian at joonet.de>
+Bug-Debian:  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666320
+Forwarded:   no
+Last-Update: 2012-04-15
+
+Because of changes in texlive packages creating pdf files
+fails. But the better way is now using html documentation.
+---
+
+diff -urN s17/Makefile s18/Makefile
+--- s17/Makefile       2011-06-18 14:23:13.296616033 +0200
++++ s18/Makefile       2012-04-14 22:49:58.597260377 +0200
+@@ -13,7 +13,7 @@
+ all: test
+       make -C src all
+       make -C images all
+-      make -C doc all
++      #make -C doc all
+ 
+ #
+ #  make help
+diff -urN s17/man/lilo.conf.5 s18/man/lilo.conf.5
+--- s17/man/lilo.conf.5        2011-06-18 18:18:41.764608846 +0200
++++ s18/man/lilo.conf.5        2012-04-14 22:51:23.020479500 +0200
+@@ -69,7 +69,7 @@
+ This configuration file specifies that lilo uses the Master
+ Boot Record on /dev/hda. (For a discussion of the various ways
+ to use lilo, and the interaction with other operating systems,
+-see user.pdf from the lilo documentation.)
++see user.pdf / user.html from the lilo documentation.)
+ .LP
+ When booting, the boot loader will issue its 
+ .I "boot:"
+@@ -95,7 +95,7 @@
+ 
+ .SH "GLOBAL OPTIONS"
+ There are many possible keywords. The description below is
+-almost literally from user.pdf (just slightly abbreviated).
++almost literally from user.pdf / user.html (just slightly abbreviated).
+ .TP
+ .BI "backup=" <backup-file>
+ Specifies the location where a copy of any modified boot sector will be
+@@ -228,7 +228,7 @@
+ are used in a
+ .I change
+ section (see below), with the suffixes "_normal" or "_hidden" appended.
+-See section "Partition type change rules" of user.pdf for more details.
++See section "Partition type change rules" of user.pdf / user.html for more details.
+ .TP
+ .BI "compact"
+ Tries to merge read requests for adjacent sectors into a single 
+@@ -258,7 +258,7 @@
+ .TP
+ .BI "disk=" <device-name>
+ Defines non-standard parameters for the specified disk.
+-See section "Disk geometry" of user.pdf for details.
++See section "Disk geometry" of user.pdf / user.html for details.
+ For versions of LILO prior to 22.5, the `bios=' parameter
+ is quite useful for specifying how the BIOS has assigned
+ device codes to your disks.

diff --git a/debian/patches/series b/debian/patches/series
index 464941324c0d872e07fb85f81920e96d6f6b6bd0..59585871ba194c619d60ee796aa7aa1617c68c0b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 15_fix-typos-in-lilo-manpage.patch
 16_fix-typos-in-user-tex.patch
 17_liloconfig-for-linux3.patch
+18_do-not-create-pdfs.patch

diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 8b7e4ea8b735bc429cc0e806842371cb2becd321..633109bdb9616936b88b9c59a75650bb8f2aca86 100644 (file)
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -15,3 +15,4 @@
 15_fix-typos-in-lilo-manpage.patch
 16_fix-typos-in-user-tex.patch
 17_liloconfig-for-linux3.patch
+18_do-not-create-pdfs.patch