Patch for resolving conflict with new Debian hotplug package

--===============0622478154==
Content-Disposition: inline
Content-Type: multipart/signed; micalg=pgp-md5;
	protocol="application/pgp-signature"; boundary="4SFOXa2GPu3tIq4H"


--4SFOXa2GPu3tIq4H
Content-Type: multipart/mixed; boundary="jRHKVT23PllUwdXP"
Content-Disposition: inline


--jRHKVT23PllUwdXP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi.

I finally got around to fixing the conflict with the hotplug package.
This is a trivial but useful fix: /etc/hotplug/firmware.agent was both
in orinoco-usb and hotplug.

The patch against 0.2.2 is attached.

Regards,

Hugo

--=20
Hugo Haas - http://larve.net/people/hugo/

--jRHKVT23PllUwdXP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="orinoco-usb-0.2.2.diff"
Content-Transfer-Encoding: quoted-printable

diff -ur orinoco-usb-0.2.2/debian/changelog orinoco-usb-0.2.2.HH/debian/cha=
ngelog
--- orinoco-usb-0.2.2/debian/changelog	2003-08-12 23:01:54.000000000 +0200
+++ orinoco-usb-0.2.2.HH/debian/changelog	2004-02-22 08:49:45.000000000 +01=
00
@@ -1,3 +1,9 @@
+orinoco-usb (0.2.2-1.1) unstable; urgency=3Dlow
+
+  * Fixed conflict with newer hotplug (already contains firmware upload ag=
ent).
+
+ -- Hugo Haas <[email protected]>  Sun, 22 Feb 2004 08:47:33 +0100
+
 orinoco-usb (0.2.2-1) unstable; urgency=3Dlow
=20
   * New "upstream" release.
diff -ur orinoco-usb-0.2.2/debian/control orinoco-usb-0.2.2.HH/debian/contr=
ol
--- orinoco-usb-0.2.2/debian/control	2003-06-26 22:10:01.000000000 +0200
+++ orinoco-usb-0.2.2.HH/debian/control	2004-02-22 08:50:19.000000000 +0100
@@ -7,7 +7,7 @@
=20
 Package: orinoco-usb
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, unzip, bc, curl, hotplug
+Depends: ${shlibs:Depends}, ${misc:Depends}, unzip, bc, curl, hotplug (>=
=3D 0.0.20040105-3)
 Description: ORiNOCO USB kernel independent pieces
  Hotplug support for orinoco_usb kernel modules.
  .
diff -ur orinoco-usb-0.2.2/debian/install orinoco-usb-0.2.2.HH/debian/insta=
ll
--- orinoco-usb-0.2.2/debian/install	2003-06-25 01:20:20.000000000 +0200
+++ orinoco-usb-0.2.2.HH/debian/install	2004-02-22 08:46:59.000000000 +0100
@@ -1,4 +1,3 @@
-hotplug/firmware.agent etc/hotplug/
 debian/firmware/Makefile usr/lib/orinoco-usb/
 util/unzip-url.sh usr/lib/orinoco-usb/
 util/extractfw usr/lib/orinoco-usb/

--jRHKVT23PllUwdXP--

--4SFOXa2GPu3tIq4H
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iQCVAwUBQDhjOqN/9WeKWvkNAQFY5gP+KZpNfURrMplxpV+A1QfxLikXkDy7wdFD
ma7bOzkVKiUqiNrk/R6VoJdjkMsl9WjNRRJkoDcdy/PNpBe2eISqwT6oAaB1GQCL
fYv5hy6pj1KBrBlTOaRjmX/+P3I0ds/DtqGHhmCbPZ1mOxBlzzxdZiW177wscI9h
sTMKNEpiA2w=
=erF7
-----END PGP SIGNATURE-----

--4SFOXa2GPu3tIq4H--


--===============0622478154==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline