Debian packaging changes:

+ Updated README.Debian with information on the changes to markdown2pdf.
+ Made latex and zip required dependencies, since they are now required
  for 'odt' and 'pdf' targets of pandoc.
+ Fixed typo in warning message.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1396 788f1e2b-df1e-0410-8736-df70ead52e1b

3 files changed, 19 insertions, 10 deletions

diff --git a/README.Debian b/README.Debian
index 8e5cacbcf..e2d2003f2 100644
--- a/README.Debian
+++ b/README.Debian
@@ -1,8 +1,17 @@
-Note to Debian users on "Suggested" dependencies:
+Notes to Debian users:
 
-If you intend to use the markdown2pdf script, you should install
-texlive-latex-recommended (or, if you use teTeX, tetex-extra). This
-provides LaTeX packages that are needed by markdown2pdf.
+1.  `markdown2pdf` has been removed, since pandoc now includes `pdf`
+    as a writer option.  You can replace
+
+        markdown2pdf foo.txt
+
+    with
+
+        pandoc foo.txt -o foo.pdf
+
+    Note that unlike `markdown2npdf`, `pandoc` requires that the output
+    filename be specified explicitly.
+
+2.  If you intend to use the html2markdown script, you should install
+    tidy, plus either wget or w3m.
 
-If you intend to use the html2markdown script, you should install
-tidy, plus either wget or w3m.
diff --git a/Text/Pandoc/PDF.hs b/Text/Pandoc/PDF.hs
index fa1e6dcf5..dc8e49df1 100644
--- a/Text/Pandoc/PDF.hs
+++ b/Text/Pandoc/PDF.hs
@@ -54,7 +54,7 @@ saveLaTeXAsPDF destinationPDFPath sourceDirRelative latex = do
   latexPathMaybe <- findExecutable "pdflatex"
   bibtexPathMaybe <- findExecutable "bibtex"
   let latexPath = case latexPathMaybe of
-                  Nothing -> error $ "The 'pdflatex' command, which is needed to build an PDF file, was not found."
+                  Nothing -> error $ "The 'pdflatex' command, which is needed to build a PDF file, was not found."
                   Just x  -> x
   let bibtexPath = case bibtexPathMaybe of
                   Nothing -> error $ "The 'bibtex' command, which is needed to build an PDF file, was not found."
diff --git a/debian/control b/debian/control
index 98236ade2..25a0e98f0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ XS-Vcs-Browser: http://pandoc.googlecode.com/svn/trunk
 Package: pandoc
 Section: text
 Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: texlive-latex-recommended | tetex-extra, tidy, wget | w3m
+Depends: ${shlibs:Depends}, zip, texlive-latex-recommended | tetex-extra
+Suggests: tidy, wget | w3m
 Description: general markup converter
  Pandoc is a Haskell library for converting from one markup format to
  another, and a command-line tool that uses this library. It can read
@@ -38,7 +38,7 @@ Description: general markup converter
 Package: libghc6-pandoc-dev
 Section: libdevel
 Architecture: any
-Depends: ${haskell:Depends}, libghc6-xhtml-dev, libghc6-mtl-dev, libghc6-network-dev
+Depends: ${haskell:Depends}, libghc6-xhtml-dev, libghc6-mtl-dev, libghc6-network-dev, zip, texlive-latex-recommended | tetex-extra
 Suggests: pandoc-doc
 Description: general markup converter
  Pandoc is a Haskell library for converting from one markup format to