Changeset 3570

Show
Ignore:
Timestamp:
05/07/10 19:49:07 (2 years ago)
Author:
steve.schnepp
Message:

- suppress building of munin-java-plugins
- building speedup (PERLLIB & OSTYPE are only evaluated once)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/snide/debian/Makefile.config

    r3533 r3570  
    1616HOSTNAME   = localhost.localdomain 
    1717 
    18 PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:vendorlib | cut -d= -f2 | sed "s/[\';]//g") 
     18PERLLIB    := $(DESTDIR)$(shell $(PERL) -V:vendorlib | cut -d= -f2 | sed "s/[\';]//g") 
    1919 
    20 JC         = /usr/lib/jvm/default-java/bin/javac 
     20JC         = /bin/false 
    2121CHECKUSER  = \# 
    2222CHECKGROUP = \# 
    …… 
    2626 
    2727# Distiction between a Linux and Freebsd kernel 
    28 OSTYPE     = $(shell debian/ostype_helper) 
     28OSTYPE     := $(shell debian/ostype_helper) 

  • people/snide/debian/changelog

    r3568 r3570  
    99    - "dirty fetch" 
    1010    - preliminary support of async polling 
    11  
    12  -- Steve Schnepp <steve.schnepp@gmail.com>  Thu, 05 May 2010 22:10:51 +0000 
     11  * Suppress java plugins. It won't be suppressed in the official package, but 
     12    I cannot build them reliably for now, sorry. 
     13 
     14 -- Steve Schnepp <steve.schnepp@gmail.com>  Fri, 07 May 2010 19:20:51 +0200 
    1315 
    1416munin (1.4.4-1) unstable; urgency=low 

  • people/snide/debian/control

    r3568 r3570  
    22Section: net 
    33Priority: optional 
    4 Maintainer: Munin Debian Maintainers <munin-deb-maint@linpro.no> 
    5 Uploaders: Tore Anderson <tore@debian.org>, Dagfinn Ilmari Mannsaker <ilmari@ilmari.org>, Loic Dachary (OuoU) <loic@debian.org>, Matthias Schmitz <matthias@sigxcpu.org>, Holger Levsen <holger@debian.org>, Stig Sandbeck Mathisen <ssm@debian.org>, Tom Feiner <feiner.tom@gmail.com> 
    6 Build-Depends-Indep: perl, htmldoc, html2text, default-jdk 
     4Maintainer: Steve Schnepp <steve.schnepp@gmail.com> 
     5Uploaders: Steve Schnepp <steve.schnepp@gmail.com> 
     6Build-Depends-Indep: perl, htmldoc, html2text 
    77Build-Depends: debhelper (>=5.0.42), quilt 
    88Standards-Version: 3.8.4 
    …… 
    5050 This package contains unsupported plugins for the Munin node, contributed by 
    5151 various users of Munin.  
    52  . 
    53  Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent 
    54  RRDtool. To see a real example of Munin in action, you can follow a link 
    55  from <http://munin.projects.linpro.no/> to a live installation. 
    56  
    57 Package: munin-java-plugins 
    58 Architecture: all 
    59 Depends: ${misc:Depends}, default-jre-headless | java6-runtime-headless | java5-runtime-headless | java2-runtime-headless  
    60 Suggests: munin, munin-node 
    61 Description: network-wide graphing framework (java plugins for node) 
    62  Munin is a highly flexible and powerful solution used to create graphs of 
    63  virtually everything imaginable throughout your network, while still 
    64  maintaining a rattling ease of installation and configuration. 
    65  . 
    66  This package contains the java based plugins that are used by munin-node to  
    67  monitor Java Management Extensions (JMX).  
    6852 . 
    6953 Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent 

  • people/snide/debian/rules

    r3568 r3570  
    77include /usr/share/quilt/quilt.make 
    88 
    9 buildpackages=munin-common munin munin-node munin-plugins-extra munin-java-plugins munin-async 
     9buildpackages=munin-common munin munin-node munin-plugins-extra munin-async 
    1010 
    1111# generate -pfoo commandline for debhelper 
    …… 
    4242                DESTDIR=`pwd`/debian/munin-node 
    4343         
    44         $(MAKE) install-plugins-java $(MAKEOPTS) \ 
    45                 DESTDIR=`pwd`/debian/munin-java-plugins 
    46  
    4744        install -D -m0644 debian/plugins.conf \ 
    4845                $(CURDIR)/debian/munin-node/etc/munin/plugin-conf.d/munin-node