[ffgtk: 2/5] Merge branch 'f17'

[Louis Lagendijk]

commit 7b3801e1203f2c92a5be6fc0e3c2562b1b402af1
Merge: 217490b 1bc7461
Author: Louis Lagendijk <louis.lagendijk at gmail.com>
Date:   Tue Jul 31 00:37:59 2012 +0200

    Merge branch 'f17'
    
    Conflicts:
    	ffgtk.spec

 ...oler.patch => ffgtk-0.8.3-use-old-spooler.patch |   16 ++--
 ffgtk-config.patch                                 |   25 -----
 ffgtk-fax.ppd                                      |   96 --------------------
 ffgtk-use-old-spooler.patch                        |   24 -----
 ffgtk.spec                                         |   11 ++-
 5 files changed, 17 insertions(+), 155 deletions(-)
---
diff --cc ffgtk.spec
index c955237,b52ab92..3ef50d2
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@@ -156,7 -154,10 +157,13 @@@ f
  %{_libdir}/ffgtk/plugins/lib_ab_google.so
  
  %changelog
+ * Mon Jul 30 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-2
+ - Fix BZ 844149:  Faxing via logical ffgtk-fax printer broken in ffgtk-0.8.3 package
+ 
 +* Tue Jul 10 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-1.1
++  temporarily disable plugin-evolution due to evolution-dataserver interface changes
++
+ * Tue Jul 10 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-1
  - New upstream release 0.8.3
  - Add FRITZ!Box 6360 Cable support
  - Add write support to speedfon ab