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

[gismo at alioth.debian.org]

Author: gismo
Date: 2009-04-02 16:07:41 +0000 (Thu, 02 Apr 2009)
New Revision: 185

Added:
   trunk/foo2zjs_20090301dfsg/debian/patches/60-hplj1000.dpatch
Modified:
   trunk/foo2zjs_20090301dfsg/debian/changelog
   trunk/foo2zjs_20090301dfsg/debian/patches/00list
Log:
debian/patches/60-hplj1000.dpatch: new file

Modified: trunk/foo2zjs_20090301dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/changelog	2009-04-02 15:48:46 UTC (rev 184)
+++ trunk/foo2zjs_20090301dfsg/debian/changelog	2009-04-02 16:07:41 UTC (rev 185)
@@ -8,8 +8,11 @@
   * debian/foo2zjs.links:
     + list all links to be created for the hplj* helper programs.
     + install links for HP LaserJet P1xxx printers.
+  * debian/patches/00list: update.
   * debian/patches/60-getweb.in.dpatch:
     + extract firmware for HP LaserJet P1005/1007 printers as well.
+  * debian/patches/60-hplj1000.dpatch:
+    + always load firmwares from /usr/share/foo2zjs/firmware.
   * debian/rules:
     + call dh_link only once.
 

Modified: trunk/foo2zjs_20090301dfsg/debian/patches/00list
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/patches/00list	2009-04-02 15:48:46 UTC (rev 184)
+++ trunk/foo2zjs_20090301dfsg/debian/patches/00list	2009-04-02 16:07:41 UTC (rev 185)
@@ -4,4 +4,5 @@
 40-desktop-encoding-correction
 40-path-correction
 60-getweb.in.dpatch
+60-hplj1000.dpatch
 80-getweb.in.dpatch

Added: trunk/foo2zjs_20090301dfsg/debian/patches/60-hplj1000.dpatch
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/patches/60-hplj1000.dpatch	                        (rev 0)
+++ trunk/foo2zjs_20090301dfsg/debian/patches/60-hplj1000.dpatch	2009-04-02 16:07:41 UTC (rev 185)
@@ -0,0 +1,65 @@
+#!/bin/sh -e
+## 60-hplj1000.dpatch, by Luca Capello <luca at pca.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use the same firmware folder for all HP LJ printers
+
+if [ $# -lt 1 ]; then
+echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+      -patch) patch $patch_opts -p1 < $0;;
+      -unpatch) patch $patch_opts -p1 -R < $0;;
+      *)
+      echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+      exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- foo2zjs-20090301dfsg.orig/hplj1000.ORG	2008-06-05 12:02:14.000000000 +0200
++++ foo2zjs-20090301dfsg.orig/hplj1000	2009-04-02 17:02:11.000000000 +0200
+@@ -77,37 +77,31 @@
+     MODEL=P1005; FWMODEL=$MODEL
+     USB1=0x03f0	#Vendor
+     USB2=0x3d17	#Model
+-    FWDIR=/usr/share/foo2xqx/firmware
+     ;;
+ *P1006)
+     MODEL=P1006; FWMODEL=$MODEL
+     USB1=0x03f0	#Vendor
+     USB2=0x3e17	#Model
+-    FWDIR=/usr/share/foo2xqx/firmware
+     ;;
+ *P1007)
+     MODEL=P1007; FWMODEL=P1005		# Alias
+     USB1=0x03f0	#Vendor
+     USB2=0x4817	#Model
+-    FWDIR=/usr/share/foo2xqx/firmware
+     ;;
+ *P1008)
+     MODEL=P1008; FWMODEL=P1006		# Alias
+     USB1=0x03f0	#Vendor
+     USB2=0x4917	#Model
+-    FWDIR=/usr/share/foo2xqx/firmware
+     ;;
+ *P1505)
+     MODEL=P1505; FWMODEL=$MODEL
+     USB1=0x03f0	#Vendor
+     USB2=0x3f17	#Model
+-    FWDIR=/usr/share/foo2xqx/firmware
+     ;;
+ *P1505n)
+     MODEL=P1505n; FWMODEL=$MODEL
+     USB1=0x03f0	#Vendor
+     USB2=0x4017	#Model
+-    FWDIR=/usr/share/foo2xqx/firmware
+     ;;
+ *1000)
+     MODEL=1000; FWMODEL=$MODEL