From a46d3659d62e0f70d414e6c77481d46f1fc7451a Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 11 Apr 2013 09:11:59 +0100 Subject: [PATCH 1/2] Device ID for HP LaserJet P1005 (bug #950776). --- hplip-deviceIDs-drv.patch | 13 +++++++++++-- hplip.spec | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index ed83ca9..e05eb14 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,6 +1,6 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv/hpcups.drv.in ---- hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv 2013-04-08 11:59:00.000000000 +0200 -+++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-04-09 12:09:48.375405551 +0200 +--- hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv 2013-04-08 10:59:00.000000000 +0100 ++++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-04-11 09:00:34.614513628 +0100 @@ -473,7 +473,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" @@ -1631,6 +1631,15 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv PCFileName "hp-laserjet_p1505.ppd" Attribute "Product" "" "(HP LaserJet p1505 Printer)" } +@@ -16927,7 +16930,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p1005" + Attribute "NickName" "" "HP LaserJet p1005, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1005" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1005;" + PCFileName "hp-laserjet_p1005.ppd" + Attribute "Product" "" "(HP LaserJet p1005 Printer)" + } @@ -16935,7 +16938,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1006" Attribute "NickName" "" "HP LaserJet p1006, hpcups $Version, requires proprietary plugin" diff --git a/hplip.spec b/hplip.spec index 47b5f5d..fa6e655 100644 --- a/hplip.spec +++ b/hplip.spec @@ -534,6 +534,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Thu Apr 11 2013 Tim Waugh +- Device ID for HP LaserJet P1005 (bug #950776). + * Tue Apr 09 2013 Jiri Popelka - 3.13.4-1 - 3.13.4 From fa85b86d7a2e0f787bdc17468a978289df955a4d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 11 Apr 2013 09:16:41 +0100 Subject: [PATCH 2/2] Fixed changelog dates. --- hplip.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hplip.spec b/hplip.spec index fa6e655..3aad00f 100644 --- a/hplip.spec +++ b/hplip.spec @@ -535,6 +535,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %changelog * Thu Apr 11 2013 Tim Waugh +- Fixed changelog dates. - Device ID for HP LaserJet P1005 (bug #950776). * Tue Apr 09 2013 Jiri Popelka - 3.13.4-1 @@ -791,7 +792,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop that we can get an authentication callback (bug #538352). - Prevent hp-fab traceback when run as root. -* Thu Nov 1 2010 Jiri Popelka 3.10.9-5 +* Thu Nov 11 2010 Jiri Popelka 3.10.9-5 - Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834). * Sun Oct 24 2010 Jiri Popelka 3.10.9-4 @@ -830,7 +831,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop - The lib sub-package now runs ldconfig for post/postun. - Use python_sitearch macro. -* Tue Sep 13 2010 Jiri Popelka +* Mon Sep 13 2010 Jiri Popelka - Added IEEE 1284 Device ID for HP LaserJet 4000 (bug #633227). * Fri Aug 20 2010 Tim Waugh - 3.10.6-3 @@ -853,10 +854,10 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop * Wed Jul 21 2010 David Malcolm - 3.10.5-8 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild -* Mon Jun 24 2010 Jiri Popelka - 3.10.5-7 +* Thu Jun 24 2010 Jiri Popelka - 3.10.5-7 - Added COPYING to common sub-package. -* Mon Jun 24 2010 Jiri Popelka - 3.10.5-6 +* Thu Jun 24 2010 Jiri Popelka - 3.10.5-6 - Main package requires explicit version of hplip-libs. * Thu Jun 17 2010 Tim Waugh - 3.10.5-5 @@ -900,7 +901,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop - HP Color LaserJet 2840 (bug #582215). - HP PSC 2400 (bug #583103). -* Thu Apr 16 2010 Jiri Popelka - 3.10.2-10 +* Fri Apr 16 2010 Jiri Popelka - 3.10.2-10 - Fixed black/blank lines in ljcolor hpcups output (bug #579461). Work-around is to send entire blank raster lines instead of skipping them. @@ -1342,7 +1343,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop * Fri Mar 30 2007 Tim Waugh - Use marker-supply-low IPP message. -* Wed Mar 1 2007 Tim Waugh 1.7.2-1 +* Thu Mar 1 2007 Tim Waugh 1.7.2-1 - 1.7.2. * Wed Feb 14 2007 Tim Waugh 1.7.1-1