Merge branch 'f14' into f15

.gitignore

@@ -38,3 +38,4 @@ hplip-3.10.5.tar.gz
 hplip-3.10.6.tar.gz
 /hplip-3.10.9.tar.gz
 /hplip-3.11.1.tar.gz
+/hplip-3.11.3.tar.gz

hplip-3.11.1.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAk02dTEACgkQc9dwzaWQR7msfACeN0/IyBLgGwKxteNK9eK1xR0W
-b8kAn0nZXFOzvtEx+NHZ7N4STBngZXpI
-=rQyC
------END PGP SIGNATURE-----

hplip-3.11.3.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAk19zDcACgkQc9dwzaWQR7natwCgyB6r9MCiI2yTvJ95734VPanA
+cWsAnRk4iUd8HFTQoDC/qFAnfj66UDkV
+=xglY
+-----END PGP SIGNATURE-----

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.11.1
-Release: 5%{?dist}
+Version: 3.11.3
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -403,6 +403,7 @@ rm -rf %{buildroot}
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
 /usr/lib/cups/filter/pstotiff
+/usr/lib/cups/filter/hpps
 %{_datadir}/cups/mime/pstotiff.convs
 # Files
 %{_datadir}/hplip/align.py*
@@ -519,6 +520,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Fri Mar 18 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.3-1
+- 3.11.3 (new hpps filter)
+
 * Tue Mar  1 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.1-5
 - Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
 - Corrected IEEE 1284 Device IDs:

sources

@@ -1 +1 @@
-86f63a00c911313206fef6a147f7faad  hplip-3.11.1.tar.gz
+9a2f39cb02214ee0def550defac0d240  hplip-3.11.3.tar.gz