Merge branch 'f15' into f16

This commit is contained in:
Tim Waugh 2011-10-07 16:11:48 +01:00
commit 11e74b012f

View File

@ -171,7 +171,7 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
# LaserJet Professional P1606dn (bug #708472)
# LaserJet Professional M1212nf MFP (bug #742490)
# Officejet 6300 series (bug #689378)
# LaserJet M1635dnf MFP (bug #743915)
# LaserJet M1536dnf MFP (bug #743915)
# PSC 1600 series (bug #743821)
%patch5 -p1 -b .deviceIDs-drv
chmod +x %{SOURCE2}
@ -523,7 +523,7 @@ fi
%changelog
* Fri Oct 7 2011 Tim Waugh <twaugh@redhat.com> 3.11.10-2
- Corrected IEEE 1284 Device IDs:
- LaserJet M1635dnf MFP (bug #743915)
- LaserJet M1536dnf MFP (bug #743915)
- PSC 1600 series (bug #743821)
* Tue Oct 04 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.10-1