[cups: 2/2] Merge branch 'f16'

[Jiří Popelka]

commit b6ff1d47f38ae11071f49257e53a50299afd8dc3
Merge: ae94f3f 9495754
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Feb 6 12:08:05 2012 +0100

    Merge branch 'f16'

 .gitignore                   |    1 +
 cups-CVE-2011-2896.patch     |   33 -------------------------
 cups-avahi-2-backend.patch   |   18 +++++++-------
 cups-driverd-timeout.patch   |   12 ---------
 cups-lspp.patch              |    8 +++---
 cups-ps-command-filter.patch |   13 ----------
 cups-snmp-quirks.patch       |    8 +++---
 cups-str3921.patch           |   14 ----------
 cups-str3947.patch           |   26 -------------------
 cups-str3999.patch           |   12 ---------
 cups-str4004.patch           |   13 ----------
 cups-str4005.patch           |   25 -------------------
 cups.spec                    |   55 +++++++++--------------------------------
 pstopdf                      |   11 ++++----
 sources                      |    2 +-
 textonly.filter              |   10 ++++----
 16 files changed, 41 insertions(+), 220 deletions(-)
---
diff --cc cups.spec
index df8f26d,e9c0ddb..5798300
--- a/cups.spec
+++ b/cups.spec
@@@ -689,14 -639,10 +654,18 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man1/ipptool.1.gz
  
  %changelog
+ * Mon Feb 06 2012 Jiri Popelka <jpopelka at redhat.com> 1:1.5.2-1
+ - 1.5.2
+ - Updated FSF address in pstopdf and textonly filters
+ 
 +* Wed Jan 18 2012 Remi Collet <remi at fedoraproject.org> 1:1.5.0-28
 +- build against php 5.4.0, patch for STR #3999
 +- add filter to fix private-shared-object-provides
 +- add %%check for php extension
 +
 +* Tue Jan 17 2012 Tim Waugh <twaugh at redhat.com> 1:1.5.0-27
 +- Use PrivateTmp=true in the service file (bug #782495).
 +
  * Tue Jan 17 2012 Tim Waugh <twaugh at redhat.com> 1:1.5.0-26
  - Replace newline characters with spaces in reported Device IDs
    (bug #782129, STR #4005).