Merge branch 'f13' into f14

This commit is contained in:
Jiri Popelka 2010-10-24 19:32:57 +02:00
commit 904ab64f81
2 changed files with 5 additions and 2 deletions

View File

@ -19,7 +19,7 @@ diff -up system-config-printer-1.2.5/ui/NewPrinterWindow.glade.NPTLpdQueue syste
<relation type="labelled-by" target="label201"/> <relation type="labelled-by" target="label201"/>
</accessibility> </accessibility>
- <signal name="changed" handler="on_entNPTDevice_changed"/> - <signal name="changed" handler="on_entNPTDevice_changed"/>
+ <signal name="changed" handler=on_cmbentNPTLpdQueue_changed""/> + <signal name="changed" handler="on_cmbentNPTLpdQueue_changed"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>

View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.2.5 Version: 1.2.5
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
@ -211,6 +211,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Sun Oct 24 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.5-5
- Correct newly added NPTLpdQueue.patch (bug #646002).
* Fri Oct 22 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.5-4 * Fri Oct 22 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.5-4
- Don't check ComboBoxEntry for allowed characters (bug #644131). - Don't check ComboBoxEntry for allowed characters (bug #644131).