Hi there,<br><br><div><span class="gmail_quote">2005/9/20, Peter Selinger <<a href="mailto:selinger@mathstat.dal.ca">selinger@mathstat.dal.ca</a>>:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
I have gone ahead and merged the regex_branch with the main<br>Development branch.<br><br>Reason: recent renaming of files and moving around of code leads to<br>conflicts between the branches that will be increasingly difficult to
<br>resolve. It is easier to merge now while the two branches are still<br>relatively similar and most edits non-overlapping.<br><br>The merge is between tags before_PSE_6 and after_PSE_6 on the<br>Development branch.<br>
</blockquote><div> </div>ok, I've just quickly tried the Development HEAD, and it's... perfect<br>
good job Peter ;-)<br></div><br>Some more points while you're at it:<br>
- newhidups will have to be renamed. My aimed was to let the name until
we can superceed hidups. Then remove hidups, and rename newhidups to
usbhid-ups (name proposition welcomed, but should match the fact that
it's for USB/HID compliant devices, not USB only).<br>
- if you have a bit more time to check for the hotplug detection (linux
only) / files installation (the files libhid.usermap and libhidups,
under scripts/hotplug ). These two files should also be renamed to
something more generall. IIRC, Charles tripplite_usb driver also use
libusb, so renaming these to nut / nut.usermap, or ups / ups.usermap
should be fine<br>
Note that there seems to be some hotplug-ng (now binary) underway. So maybe some hotplug files changes too... To be digged.<br>
<br>
Both of the above are for the Dev tree, Stable should remain as is...<br>
<br clear="all">Arnaud<br>-- <br>Linux / Unix Expert - MGE UPS SYSTEMS - R&D Dpt<br>Network UPS Tools (NUT) Project Leader - <a href="http://www.networkupstools.org/">http://www.networkupstools.org/</a><br>Debian Developer -
<a href="http://people.debian.org/%7Eaquette/">http://people.debian.org/~aquette/</a><br>OpenSource Developer - <a href="http://arnaud.quette.free.fr/">http://arnaud.quette.free.fr/</a>