[Foo2zjs-commits] r190 - in trunk/foo2zjs_20090301dfsg/debian: . patches

[Michael Koch]

Author: mkoch
Date: 2009-07-30 19:46:38 +0000 (Thu, 30 Jul 2009)
New Revision: 190

Modified:
   trunk/foo2zjs_20090301dfsg/debian/changelog
   trunk/foo2zjs_20090301dfsg/debian/patches/60-hplj1000.dpatch
Log:
fix bug #526781

Modified: trunk/foo2zjs_20090301dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/changelog	2009-07-30 19:30:59 UTC (rev 189)
+++ trunk/foo2zjs_20090301dfsg/debian/changelog	2009-07-30 19:46:38 UTC (rev 190)
@@ -1,5 +1,7 @@
-foo2zjs (20090301dfsg-4) UNRELEASED; urgency=low
+foo2zjs (20090301dfsg-5) UNRELEASED; urgency=low
 
+  * debian/patches/40-hplj1000.dpatch: Updated to also guard globbered
+    names in find call (Closes: 526781).
   * debian/copyright: Link to /usr/share/common-licenses/GPL-2
     instead of /usr/share/common-licenses/GPL.
   * debian/control:
@@ -8,7 +10,7 @@
     + Updated Standards-Version to 3.8.2.
   * debian/patches/90-manpages.dpatch: New dpatch to fix manpage errors.
 
- -- Michael Koch <konqueror at gmx.de>  Thu, 30 Jul 2009 15:59:52 +0200
+ -- Michael Koch <konqueror at gmx.de>  Thu, 30 Jul 2009 21:44:44 +0200
 
 foo2zjs (20090301dfsg-3) unstable; urgency=low
 

Modified: trunk/foo2zjs_20090301dfsg/debian/patches/60-hplj1000.dpatch
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/patches/60-hplj1000.dpatch	2009-07-30 19:30:59 UTC (rev 189)
+++ trunk/foo2zjs_20090301dfsg/debian/patches/60-hplj1000.dpatch	2009-07-30 19:46:38 UTC (rev 190)
@@ -63,3 +63,12 @@
      ;;
  *1000)
      MODEL=1000; FWMODEL=$MODEL
+@@ -207,7 +207,7 @@
+     #
+     # Sniff around for printers that need a firmware download
+     #
+-    usblps=`find /dev/usb -name lp*`" "`find /dev -name usblp*`
++    usblps=`find /dev/usb -name 'lp*'`" "`find /dev -name 'usblp*'`
+     for dev in $usblps; do
+ 	status=`$PRINTERID $dev 2>/dev/null | grep -y "hp LaserJet $MODEL"`
+ 	if [ "$status" != "" ]; then