Merge branch 'f14' into f15

2011-03-31 18:00:22 +01:00 · 2011-03-31 18:00:22 +01:00 · db390b63b4
commit db390b63b4
parent 734e7b757a 0356674bde
5 changed files with 13 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -39,3 +39,4 @@ 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.3a.tar.gz
--- a/hplip-3.11.3.tar.gz.asc
+++ b/hplip-3.11.3.tar.gz.asc
@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAk19zDcACgkQc9dwzaWQR7natwCgyB6r9MCiI2yTvJ95734VPanA
-cWsAnRk4iUd8HFTQoDC/qFAnfj66UDkV
-=xglY
-----END PGP SIGNATURE-----
--- a/hplip-3.11.3a.tar.gz.asc
+++ b/hplip-3.11.3a.tar.gz.asc
@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAk2MMigACgkQc9dwzaWQR7mfcQCfWGlPpnUaFTtAEc8xVnCQ/8Te
+kyIAoNSFJKZ5wTb2ckNmzucl+h+2b9EO
+=1QoL
+-----END PGP SIGNATURE-----
--- a/hplip.spec
+++ b/hplip.spec
@ -1,6 +1,6 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.11.3
+Version: 3.11.3a
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
@ -520,6 +520,9 @@ fi
 %postun libs -p /sbin/ldconfig

 %changelog
+* Thu Mar 31 2011 Tim Waugh <twaugh@redhat.com> 3.11.3a-1
+- 3.11.3a.
+
 * Fri Mar 18 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.3-1
 - 3.11.3 (new hpps filter)

--- a/2
+++ b/2
@ -1 +1 @@
-9a2f39cb02214ee0def550defac0d240  hplip-3.11.3.tar.gz
+967e095bec457b4acc858774d673f884  hplip-3.11.3a.tar.gz