[Pkg-erlang-commits] r1144 - in yaws/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2009-12-12 16:21:30 +0000 (Sat, 12 Dec 2009)
New Revision: 1144

Modified:
   yaws/trunk/debian/changelog
   yaws/trunk/debian/control
   yaws/trunk/debian/patches/docs.diff
Log:
[yaws]
  * Renamed \ifpdf macro to \ifpdfoutput in yaws.tex documentation file because
    it clashes with ifpdf package which is sourced by geometry package in
    TeXLive 2009 (closes: #560759).
  * Added texlive-font-utils to build dependencies because epstopdf script has
    been moved to it from texlive-extra-utils in TeXLive 2009.


Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog	2009-12-11 17:37:56 UTC (rev 1143)
+++ yaws/trunk/debian/changelog	2009-12-12 16:21:30 UTC (rev 1144)
@@ -1,8 +1,12 @@
-yaws (1.86-2) UNRELEASED; urgency=low
+yaws (1.86-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Renamed \ifpdf macro to \ifpdfoutput in yaws.tex documentation file because
+    it clashes with ifpdf package which is sourced by geometry package in
+    TeXLive 2009 (closes: #560759).
+  * Added texlive-font-utils to build dependencies because epstopdf script has
+    been moved to it from texlive-extra-utils in TeXLive 2009.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 11 Dec 2009 20:37:42 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 12 Dec 2009 19:19:32 +0300
 
 yaws (1.86-1) unstable; urgency=low
 

Modified: yaws/trunk/debian/control
===================================================================
--- yaws/trunk/debian/control	2009-12-11 17:37:56 UTC (rev 1143)
+++ yaws/trunk/debian/control	2009-12-12 16:21:30 UTC (rev 1144)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5.0.0), autotools-dev,
  erlang-dev (>= 1:13.b.1-3), erlang-edoc, erlang-mnesia, mime-support, libpam0g-dev,
  texlive-latex-base, texlive-latex-recommended, texlive-fonts-recommended,
- texlive-extra-utils, ghostscript, quilt
+ texlive-font-utils, texlive-extra-utils, ghostscript, quilt
 Standards-Version: 3.8.3
 Homepage: http://yaws.hyber.org/
 Vcs-Svn: svn://svn.debian.org//svn/pkg-erlang/yaws/trunk/

Modified: yaws/trunk/debian/patches/docs.diff
===================================================================
--- yaws/trunk/debian/patches/docs.diff	2009-12-11 17:37:56 UTC (rev 1143)
+++ yaws/trunk/debian/patches/docs.diff	2009-12-12 16:21:30 UTC (rev 1144)
@@ -1,5 +1,6 @@
 Patch removes dependency om non-free latex2html package when building
-docs.
+docs. Also, it renames \ifpdf to \ifpdfoutput to avoid clash with ifpdf
+package (sourced by geometry package in TeXLive 2009).
 
 --- yaws-1.86.orig/doc/Makefile
 +++ yaws-1.86/doc/Makefile
@@ -15,6 +16,30 @@
  
 --- yaws-1.86.orig/doc/yaws.tex
 +++ yaws-1.86/doc/yaws.tex
+@@ -1,18 +1,18 @@
+ \documentclass[11pt,oneside,english]{book}
+-\newif\ifpdf
++\newif\ifpdfoutput
+ \ifx\pdfoutput\undefined
+-   \pdffalse              % we are not running PDFLaTeX
++   \pdfoutputfalse              % we are not running PDFLaTeX
+ \else
+    \ifnum \pdfoutput=0    % we are running PDFLaTeX generating DVI
+-      \pdffalse
++      \pdfoutputfalse
+    \else
+       \ifnum \pdfoutput=1 % we are running PDFLaTeX generating PDF
+-      \pdftrue
++      \pdfoutputtrue
+       \fi
+    \fi
+ \fi
+ 
+-\ifpdf
++\ifpdfoutput
+   \usepackage[pdftex]{graphicx}
+   \pdfcompresslevel=9
+   \DeclareGraphicsExtensions{.png,.jpg,.pdf,.mps}
 @@ -44,7 +44,7 @@
  
  \usepackage[T1]{fontenc}