Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv7719

Modified Files:
        nut.info 
Log Message:
nut-2.6.2-2: merge fail


Index: nut.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/nut.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- nut.info    4 Oct 2011 02:00:29 -0000       1.12
+++ nut.info    4 Oct 2011 02:02:22 -0000       1.13
@@ -1,6 +1,6 @@
 Package: nut
 Version: 2.6.2
-Revision: 1
+Revision: 2
 
 Depends: libupsclient1-shlibs
 # TODO: figure out necessary BuildConflicts for Fink's net-snmp package
@@ -138,7 +138,7 @@
 
 SplitOff6: <<
   Package: %N-xml
-  Depends: %N, neon26-shlibs, libgettext3-shlibs, libiconv, libxml2-shlibs
+  Depends: %N, neon27-shlibs, libgettext8-shlibs, libiconv, libxml2-shlibs
   Files: <<
     lib/nut/netxml-ups
     share/man/man8/netxml-ups.8
@@ -154,15 +154,14 @@
 battery or has a low battery.
 
 If you have a serial UPS, you will need a USB-to-serial converter and OS X
-drivers for the converter. (PalmConnect converters will not work with the
-Palm-provided driver.) In this case, install the base "nut" package.
+drivers for the converter. In this case, install the base "nut" package.
 
 If your UPS connects via a USB cable, install the "nut-usb" package. This
 covers most APC Back-UPS models, as well as MGE Ellipse, Comet, Nova,
 Evolution, and Protection Center units. Some Belkin models may be supported.
 Tripp Lite USB models that use usbhid-ups (especially ones with LCD in their
 name) should work, but the tripplite_usb driver currently cannot open
-entry-level Tripp Lite USB devices on Mac OS X..
+entry-level Tripp Lite USB devices on Mac OS X.
 
 If you have a MGE UPS with a Network Management Card that supports the XML/HTTP
 protocol, then you will want the "nut-xml" package.


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to