Hi Tom, On Freitag, 25. September 2009, Tom Feiner wrote: > OK, I cleaned up /branches/debian/experimental (I tagged the previous > contents of this dir under /branches/debian/experimental/tags/1.3.3-1).
I've followed your commits, great!
> Following Stig's recommendation, I've used version 1.4.0-dev+svn2484 as the
> version name. I hope that's ok.
Nope, it's not:
$ dpkg --compare-versions 1.4.0-dev+svn2484 lt 1.4.0-1 ; echo $?
1
$ dpkg --compare-versions 1.4.0-dev+svn2484 gt 1.4.0-1 ; echo $?
0
Please use 1.4.0~dev+svn2484, so that we can upload 1.4.0-1 if we want to :-)
Hmm, 1.4.0~svn2481-1 is even better or 1.4.0~dev+svn2484-1...
> In upstream trunk:
Just to be clear: you committed to trunk or did you modify trunk by means of
debian/patches/ ?
> * Slightly modified upstream Makefile to honor overriding
> This takes care of the changes need to build the packages, the resulting
> packages are almost lintian clean, the following warnings/errors remain for
> the munin package:
>
> W: munin: binary-without-manpage usr/bin/munin-check
> E: munin: dir-or-file-in-var-www var/www/munin/
> E: munin: dir-or-file-in-var-www var/www/munin/.htaccess
> E: munin: dir-or-file-in-var-www var/www/munin/favicon.ico
IMO we should leave this (lintian warnings) as they are, as these are issues
we/upstream need to fix. Changing the location from /var/www
to /srv/www/munin or such is something I would really like to see fixed for
squeeze, but I'm not really sure what is the best location. Maybe we should
start a thread on debian-devel@ to gather information+opinions how other
packages handle that.
> W: munin: executable-not-elf-or-script ./usr/share/munin/VeraMono.ttf
debian/rules should delete that file and we should use this font from the
proper package already in Debian.
> The 2 warnings are easy to fix,
hah. I should finish reading mails before starting to answer them ;-)
> however the dir-or-file-in-var-www is a bit
> more complicated, as 1.2.6 uses it too. I guess for experimental we can do
> the right thing which is to place the www section under
> /usr/share/munin/www and add an apache alias to point there.
Hm, doesnt munin still store files there? /usr needs to be read-only :)
> But I'm not
> sure how well this will behave in upgrades from 1.2.6.
As a first thought, I wouldn't change that on upgrades, but only for new
installations. Then we "just" need to make sure it works for upgrades :)
> Please let me know if I should be doing anything differently, any
> help,advice,comments would be appreciated :)
See above :-) I think you are doing great, thanks a lot!
regards,
Holger
signature.asc
Description: This is a digitally signed message part.
