Merge tag 'upstream/4.0.14'

Upstream version 4.0.14

1 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d375dd4..016afdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-14  Till Kamppeter <till.kamppeter@gmail.com>
+
+	* Tagged branch for release 4.0.14.
+
+	* VERSION, README, USAGE, configure.ac: Updated for release 4.0.14.
+
+	* foomaticrip.c: If the input data is PDF but the driver requires
+	  PostScript, use the pdftops CUPS filter when CUPS is the spooler.
+	  This way we always use the same method to convert PDF to PostScript
+	  in the whole system, including any workarounds applied in the CUPS
+	  filter.
+
 2012-03-02  Till Kamppeter <till.kamppeter@gmail.com>
 
 	* Tagged branch for release 4.0.13.