package monit
severity 479357 important
tags 479357 patch lenny
stop
Stefan Alfredsson <[EMAIL PROTECTED]> wrote:
Martin Pala wrote:
Note that it's possible to set the path to monitrc using the
--sysconfdir configure option.
If Debian package uses /etc/monit/monitrc by default (which is not
in the hardcoded search path), it could be good to use the
--sysconfdir to set the path properly.
This is a debian-specific modification, to get /etc more structured
(e.g. if you want include files, you can keep them all in
/etc/monit/, instead of having both /etc/monitrc and
/etc/monit.d/{extra1, extra2, extra3}.
It seems I slipped up patching while updating to a new upstream
version. I'll look into it and upload a fixed version.
While backporting the latest monit to etch I stumbled upon this bug.
The fix is attached and consists of the following:
a) include dpatch.mk from cdbs
b) remove dpatch's own makefile include (useless with cdbs)
c) provide correct 00list file inside debian/patches (dpatch won't work
without it)
I will also rise the severity to important, as this bug is serious
enough to get fixed before the release of Lenny.
Grüße,
Sven.
diff -Nur monit-4.10.1/debian/changelog monit-4.10.1_sh/debian/changelog
--- monit-4.10.1/debian/changelog 2008-08-19 23:33:56.000000000 +0200
+++ monit-4.10.1_sh/debian/changelog 2008-08-19 18:23:11.000000000 +0200
@@ -1,3 +1,15 @@
+monit (1:4.10.1-3~dvz.2) dvz-etch; urgency=low
+
+ * Attempt to correct patching
+
+ -- DVZ-Team <[EMAIL PROTECTED]> Tue, 19 Aug 2008 18:22:54 +0200
+
+monit (1:4.10.1-3~dvz.1) dvz-etch; urgency=low
+
+ * Backported to Etch
+
+ -- DVZ-Team <[EMAIL PROTECTED]> Tue, 19 Aug 2008 18:02:35 +0200
+
monit (1:4.10.1-3) unstable; urgency=low
* SSL enabled as upstream provided GPL/OpenSSL
diff -Nur monit-4.10.1/debian/patches/00list monit-4.10.1_sh/debian/patches/00list
--- monit-4.10.1/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100
+++ monit-4.10.1_sh/debian/patches/00list 2008-08-19 18:28:36.000000000 +0200
@@ -0,0 +1,2 @@
+config_file_relocation
+monit.1-debian-path
diff -Nur monit-4.10.1/debian/rules monit-4.10.1_sh/debian/rules
--- monit-4.10.1/debian/rules 2008-08-19 23:33:56.000000000 +0200
+++ monit-4.10.1_sh/debian/rules 2008-08-19 23:34:52.000000000 +0200
@@ -1,8 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/dpatch/dpatch.make
# This variable adds several arguments to the ./configure invocation,
# in *addition* to what autotools.mk does normally. So the end command
