[system-config-printer: 5/5] Merge branch 'f14'

[Tim Waugh]

commit 6fa0e553f6013602015b8ef51b14a3ecf40a5d2b
Merge: 8a4add1 5400f18
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Oct 13 13:45:24 2010 +0100

    Merge branch 'f14'

 .gitignore                               |    1 +
 sources                                  |    2 +-
 system-config-printer-1.2.4.tar.xz.sig   |  Bin 65 -> 0 bytes
 system-config-printer-1.2.5.tar.xz.sig   |  Bin 0 -> 65 bytes
 system-config-printer-translations.patch |39332 ------------------------------
 system-config-printer.spec               |   31 +-
 6 files changed, 28 insertions(+), 39338 deletions(-)
---
diff --cc system-config-printer.spec
index 1c07ee7,9d43211..8b6f88b
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@@ -201,8 -198,32 +198,32 @@@ rm -rf %buildroo
  exit 0
  
  %changelog
+ * Wed Oct 13 2010 Tim Waugh <twaugh at redhat.com> - 1.2.5-1
+ - 1.2.5:
+   - CMD-field matching for PPDs (bug #630058).
+   - Avoid crash in jobviewer (bug #640904).
+   - Don't try to modify firewall for SNMP broadcast responses
+     as it doesn't work (trac #214).
+   - Correctly parse snmp backend output when fetching
+     Device ID (bug #639394).
+   - XmlHelper: Don't indent output when saving to file (bug #639586).
+   - GroupsPaneModel: Avoid crash when removing queue (bug #639586).
+   - Use "Do It Later" instead of "Cancel" for adjust firewall
+     dialog (trac #213).
+   - Delete Bluetooth printer's queue when unpaired.
+   - Show examples of IPP URIs (bug #575795).
+   - Use actual Device ID strings in 'no match' debug
+     message (bug #630350).
+   - Prevent disallowed characters in text entry fields when adding
+     new printer (bug #621199).
+   - Fixed race condition while renaming printer (bug #625502).
+   - Request required job attributes rather than assuming they will
+     be present in response (bug #635719).
+   - Discard disallowed characters when renaming (bug #612315).
+   - Mark more translatable strings (bug #634436).
+ 
 -* Fri Oct  1 2010 Tim Waugh <twaugh at redhat.com> - 1.2.4-3
 -- Use actual device ID in debug output (bug #630350).
 +* Wed Sep 29 2010 jkeating - 1.2.4-3
 +- Rebuilt for gcc bug 634757
  
  * Mon Sep 13 2010 Tim Waugh <twaugh at redhat.com> - 1.2.4-2
  - Rebuilt with updated translations.