[Foo2zjs-commits] r204 - in trunk/foo2zjs_20090908dfsg/debian: . patches
Luca Capello
gismo at alioth.debian.org
Sun Mar 7 19:44:35 UTC 2010
Author: gismo
Date: 2010-03-07 19:44:35 +0000 (Sun, 07 Mar 2010)
New Revision: 204
Added:
trunk/foo2zjs_20090908dfsg/debian/foo2zjs.preinst
Modified:
trunk/foo2zjs_20090908dfsg/debian/changelog
trunk/foo2zjs_20090908dfsg/debian/control
trunk/foo2zjs_20090908dfsg/debian/patches/30-udev-rules.dpatch
trunk/foo2zjs_20090908dfsg/debian/rules
Log:
debian/*: (Closes: #558978) fix udev rules file
Modified: trunk/foo2zjs_20090908dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/changelog 2009-10-23 06:05:56 UTC (rev 203)
+++ trunk/foo2zjs_20090908dfsg/debian/changelog 2010-03-07 19:44:35 UTC (rev 204)
@@ -1,11 +1,26 @@
foo2zjs (20090908dfsg-2) UNRELEASED; urgency=low
+ [ Michael Koch ]
* Removed Luca Bedogni from Uploaders as he is MIA (Closes: 550268).
* Updated Build-Depends on debhelper to level 7.
* Replaced dh_clean -h by dh_prep.
- -- Michael Koch <konqueror at gmx.de> Fri, 23 Oct 2009 07:59:03 +0200
+ [ Steve Langasek ]
+ * debian/control: Breaks: udev (<< 136-1) to ensure the correct udev
+ version is used.
+ * debian/foo2zjs.preinst: when installing or upgrading, remove the
+ old udev rules file /etc/udev/rules.d/11-hplj10xx.rules if it has
+ not been locally modified.
+ * debian/patches/30-udev-rules.dpatch (Closes: #558978):
+ + 'BUS=="usb"' is deprecated, replaced with 'SUBSYSTEMS=="usb"'.
+ + Removed UDEV rule items which conflict with the general UDEV rules
+ for USB printers: 'NAME="usb/%k"', 'MODE="0666"'.
+ + Change SYSFS to ATTRS.
+ * debian/rules: install the udev rules file as
+ /lib/udev/rules.d/85-hplj10xx.rules.
+ --
+
foo2zjs (20090908dfsg-1) unstable; urgency=low
* New upstream release.
Modified: trunk/foo2zjs_20090908dfsg/debian/control
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/control 2009-10-23 06:05:56 UTC (rev 203)
+++ trunk/foo2zjs_20090908dfsg/debian/control 2010-03-07 19:44:35 UTC (rev 204)
@@ -14,6 +14,7 @@
Depends: ${shlibs:Depends}
Recommends: foomatic-db-engine, wget, tk8.4, tix
Suggests: psutils, hannah-foo2zjs
+Breaks: udev (<< 136-1)
Description: Support for printing to ZjStream-based printers
foo2zjs is an open source printer driver for printers that use the
Zenographics ZjStream wire protocol for their print data, such as the
Added: trunk/foo2zjs_20090908dfsg/debian/foo2zjs.preinst
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/foo2zjs.preinst (rev 0)
+++ trunk/foo2zjs_20090908dfsg/debian/foo2zjs.preinst 2010-03-07 19:44:35 UTC (rev 204)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+ if [ -e "/etc/udev/rules.d/11-hplj10xx.rules" ]; then
+ if [ "`md5sum \"/etc/udev/rules.d/11-hplj10xx.rules\" | sed -e \"s/ .*//\"`" = \
+ "`dpkg-query -W -f='${Conffiles}' foo2zjs | sed -n -e \"\\\\' /etc/udev/rules.d/11-hplj10xx.rules's/.* //p\"`" ]
+ then
+ rm -f "/etc/udev/rules.d/11-hplj10xx.rules"
+ fi
+ fi
+fi
+
+#DEBHELPER#
Modified: trunk/foo2zjs_20090908dfsg/debian/patches/30-udev-rules.dpatch
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/patches/30-udev-rules.dpatch 2009-10-23 06:05:56 UTC (rev 203)
+++ trunk/foo2zjs_20090908dfsg/debian/patches/30-udev-rules.dpatch 2010-03-07 19:44:35 UTC (rev 204)
@@ -24,52 +24,68 @@
@DPATCH@
--- foo2zjs-20081007dfsg/hplj10xx.rules.ORG 2008-10-17 15:40:55.000000000 +0200
-+++ foo2zjs-20081007dfsg/hplj10xx.rules 2008-10-17 15:44:52.000000000 +0200
++++ foo2zjs-20090908dfsg/hplj10xx.rules 2010-03-07 18:11:05.000000000 +0100
@@ -1,36 +1,36 @@
#Own udev rule for HP Laserjet 1000
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", \
- SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000"
-+ SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", \
-+ SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/usr/sbin/hplj1000"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{product}=="hp LaserJet 1000", \
++ SYMLINK+="hplj1000-%n", RUN+="/usr/sbin/hplj1000"
#Own udev rule for HP Laserjet 1005
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \
- SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005"
-+ SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \
-+ SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/usr/sbin/hplj1005"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{product}=="hp LaserJet 1005 series", \
++ SYMLINK+="hplj1005-%n", RUN+="/usr/sbin/hplj1005"
#Own udev rule for HP Laserjet 1018
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", \
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", \
- SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018"
-+ SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/usr/sbin/hplj1018"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{product}=="HP LaserJet 1018", \
++ SYMLINK+="hplj1018-%n", RUN+="/usr/sbin/hplj1018"
#Own udev rule for HP Laserjet 1020
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", \
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", \
- SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020"
-+ SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/usr/sbin/hplj1020"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{product}=="HP LaserJet 1020", \
++ SYMLINK+="hplj1020-%n", RUN+="/usr/sbin/hplj1020"
#Own udev rule for HP Laserjet P1005
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- SYSFS{product}=="HP LaserJet P1005", NAME="usb/%k", \
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1005", NAME="usb/%k", \
- SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1005"
-+ SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/usr/sbin/hpljP1005"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{product}=="HP LaserJet P1005", \
++ SYMLINK+="hpljP1005-%n", RUN+="/usr/sbin/hpljP1005"
#Own udev rule for HP Laserjet P1006
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- SYSFS{product}=="HP LaserJet P1006", NAME="usb/%k", \
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1006", NAME="usb/%k", \
- SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1006"
-+ SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/usr/sbin/hpljP1006"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{product}=="HP LaserJet P1006", \
++ SYMLINK+="hpljP1006-%n", RUN+="/usr/sbin/hpljP1006"
#Own udev rule for HP Laserjet P1007
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- SYSFS{product}=="HP LaserJet P1007", NAME="usb/%k", \
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1007", NAME="usb/%k", \
- SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1007"
-+ SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/usr/sbin/hpljP1007"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{product}=="HP LaserJet P1007", \
++ SYMLINK+="hpljP1007-%n", RUN+="/usr/sbin/hpljP1007"
#Own udev rule for HP Laserjet P1008
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- SYSFS{product}=="HP LaserJet P1008", NAME="usb/%k", \
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1008", NAME="usb/%k", \
- SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1008"
-+ SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/usr/sbin/hpljP1008"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{product}=="HP LaserJet P1008", \
++ SYMLINK+="hpljP1008-%n", RUN+="/usr/sbin/hpljP1008"
#Own udev rule for HP Laserjet P1505
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- SYSFS{product}=="HP LaserJet P1505", NAME="usb/%k", \
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1505", NAME="usb/%k", \
- SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1505"
-+ SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/usr/sbin/hpljP1505"
++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{product}=="HP LaserJet P1505", \
++ SYMLINK+="hpljP1505-%n", RUN+="/usr/sbin/hpljP1505"
Modified: trunk/foo2zjs_20090908dfsg/debian/rules
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/rules 2009-10-23 06:05:56 UTC (rev 203)
+++ trunk/foo2zjs_20090908dfsg/debian/rules 2010-03-07 19:44:35 UTC (rev 204)
@@ -60,7 +60,7 @@
rm -f $(CURDIR)/debian/foo2zjs/usr/share/doc/foo2zjs/COPYING
rm -f $(CURDIR)/debian/foo2zjs/usr/share/doc/foo2zjs/INSTALL
rm -f $(CURDIR)/debian/foo2zjs/usr/share/doc/foo2zjs/INSTALL.osx
- install -D -m 644 hplj10xx.rules $(CURDIR)/debian/foo2zjs/etc/udev/rules.d/11-hplj10xx.rules
+ install -D -m 644 hplj10xx.rules $(CURDIR)/debian/foo2zjs/lib/udev/rules.d/85-hplj10xx.rules
install -m 755 hplj1000 $(CURDIR)/debian/foo2zjs/usr/sbin/hplj1000
install -m 755 getweb $(CURDIR)/debian/foo2zjs/usr/bin/getweb
touch $(CURDIR)/debian/foo2zjs/usr/share/foo2zjs/tmp/.placeholder
More information about the Foo2zjs-commits
mailing list