[ghostscript/f14/master: 3/3] Merge branch 'f13' into f14

[Tim Waugh]

commit 5a1f2e81bce11f18d14efbc3745950d3a9add58c
Merge: 5c5fe72 1deda51
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Sep 30 17:22:14 2010 +0100

    Merge branch 'f13' into f14

 ghostscript-ps2epsi-cr.patch |   14 ++++++++++++++
 ghostscript.spec             |   14 ++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --cc ghostscript.spec
index 4d63b06,04777bc..daba348
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -383,9 -389,10 +389,13 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
+ * Thu Sep 30 2010 Tim Waugh <twaugh at redhat.com> 8.71-17
+ - Don't use carriage return in ps2epsi output (bug #635786).
+ - Include more documentation (bug #634354).
+ 
 +* Wed Sep 29 2010 jkeating - 8.71-16.1
 +- Rebuilt for gcc bug 634757
 +
  * Mon Sep 13 2010 Tim Waugh <twaugh at redhat.com> 8.71-16
  - Pulled in gs_fonts.ps modification for .runlibfileifexists from
    OpenSUSE package (bug #610301).