Skip to content

Commit

Permalink
Remove workaround concerning java-plugins (667493) in debian/rules as…
Browse files Browse the repository at this point in the history
… upstream has fixed this in e7e29c4 in 2.0.3.
  • Loading branch information
h01ger committed Aug 8, 2012
1 parent c795a65 commit f495fd0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 3 additions & 1 deletion debian/changelog
Expand Up @@ -2,7 +2,9 @@ munin (2.0.4-1) UNRELEASED; urgency=low

[ Holger Levsen ]
* New upstream version(s), fixing lots of bugs and adding documentation and
manpages. See upstream ChangeLog for the full list.
manpages. See upstream ChangeLog for the full list. Remove workaround
concerning java-plugins (667493) in debian/rules as upstream has fixed
this in e7e29c4 in 2.0.3.
* munin-async.init:
- run munin-async as munin-async user (Closes: #684171)
- use stop function from munin-node.init to make it actually stop it
Expand Down
6 changes: 0 additions & 6 deletions debian/rules
Expand Up @@ -37,12 +37,6 @@ override_dh_auto_install:
MANDIR=$(CURDIR)/debian/munin-doc/usr/share/man \
DESTDIR=$(CURDIR)/debian/munin-plugins-java

# Move the jmx_ plugin to the munin-plugins-java package
# see http://bugs.debian.org/667493
mkdir -p $(CURDIR)/debian/munin-plugins-java/usr/share/munin/plugins/
mv -v $(CURDIR)/debian/munin-plugins-core/usr/share/munin/plugins/jmx_ \
$(CURDIR)/debian/munin-plugins-java/usr/share/munin/plugins/jmx_

# Install apache configuration
install -D -m0644 debian/munin.apache.conf \
$(CURDIR)/debian/munin/etc/munin/apache.conf
Expand Down

0 comments on commit f495fd0

Please sign in to comment.