Changeset 1745

Show
Ignore:
Timestamp:
12/01/08 15:25:54 (1 month ago)
Author:
ton
Message:

Move nagiosgraph out of Makefile generation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/DEV-opsview3/opsview-base/Makefile

    r1743 r1745  
    8989 
    9090GENERATED = ${NAGIOS} ${NAGIOSPLUG} ${NRPE} ${SCRIPT} ${VALIDATION} ${NSCA} ${JSCAL} \ 
    91         ${NAGIOSGRAPH} ${NDOUTILS} nrpe.cfg opsview-base.spec version \ 
     91        ${NDOUTILS} nrpe.cfg opsview-base.spec version \ 
    9292        allmibs.tar.gz ${CHECK_RADIUS_IH} ${AUTOSSH} ${OVERLIB} ${HYPERGRAPH} ${NMIS} ${FABTABULOUS} 
    9393 
    …… 
    9595 
    9696install: dirs ${NAGIOS}-install ${NAGIOSPLUG}-install ${NRPE}-install ${NSCA}-install \ 
    97         javascript-install ${NAGIOSGRAPH}-install ${NDOUTILS}-install install-mibs \ 
     97        javascript-install ${NDOUTILS}-install install-mibs \ 
    9898        ${CHECK_RADIUS_IH}-install ${AUTOSSH}-install ${NMIS}-install nrpe.cfg-install \ 
    9999        ${FABTABULOUS}-install post-test 

  • branches/DEV-opsview3/opsview-base/debian/control

    r1521 r1745  
    1010Pre-Depends: mysql-server 
    1111Depends: opsview-perl (>= 2.13.0), mysql-server-5.0 | mysql-server-4.1 (>= 4.1.10), apache2, ksh, mrtg, libgd2-noxpm | libgd2-xpm, libmcrypt4, rrdtool (>= 1.2.15), sudo | sudo-ldap, libltdl3, snmp, snmpd, dnsutils, libgd-tools, netpbm, less, links, libexpat1, openssl, mailx 
    12 Conflicts: opsview-core (<< 2.12.0) 
     12# Need this conflicts section because nagiosgraph has moved to opsview-core 
     13Conflicts: opsview-core (<< 3.0) 
    1314Description: Main component for Opsview 
    1415 Provides the bulk of the components for Opsview, a