Merge with version 0.0.12-24 from Debian unstable

1) why do you still report the bug number (LP: #129828)? it's not needed as far as you are merging this package and not fixing it. (fix was done by Luca already in 0.0.12-22ubuntu1 revision)
2) I see not-documented changes in debian/docs
3) tmp stuff should be dropped to prevent any problem while applying this debdiff.

Would you mind fixing those? Thanks.

Please re-subscribe u-u-s when you will provide a working debdiff. Good work.

Well, all done.

Do you think it's ok?

Thanks.

This change: "docs mentions html files that now are xml" is not a previous ubuntu change and should therefore be reported as a different change.
In any case, why did you make such a change?
The xml are used during build to make the html which is then installed correctly, therefore please don't change it or you will introduce a bug.

Concerning the previous ubuntu change, can you check if it is still necessary?
Looking at the original bug report, and the change description for 0.0.12-24, I have the impression that this might not be needed anymore.

Thanks.

I would like to add that I changed your bug description (was talking about wesnoth) and the title. It seems you have been working on a previous debian version, as most probably 0.0.12-24 was not available when you first prepared your patch.

Yes, i start the merge when was available versione 0.0.12-23.
So, I'll regain the sources and merging, asap.

For the xml issue, I'll take a look, perhaps I misunderstand the debian/rules.
Thanks.

You shouldn't look at debian/rules. If you check your build log, you should see something like:

make[2]: Entering directory `/tmp/buildd/yaird-0.0.12/doc'
/usr/bin/xmlto xhtml-nochunks yaird.xml

This is part of the upstream makefile, simply entering the doc directory and executing the xmlto command, which, in this case, convert the DocBook XML document (yaird.xml) to the HTML file (yaird.html).
This latter is the one which is (correctly) installed by debian/rules.

You were perhaps confused by the fact that this is an "on-the-fly" generation.

Ok, i took the last version for the merge.

About the patch, it seems it's still needed, this is the output in Hardy with installed the debian version 0.0.12-24:

gaspa@cthulhu:/mnt/sorgenti/ubuntu/yaird$ sudo dpkg-reconfigure linux-image-`uname -r`
Running depmod.
mkinitrd.yaird: opzione non valida -- u
Terminating...
Failed to create initrd image.

Perhaps it would be better patch kernel-package (or who for him) in order to make scripts indipendent from the ramdisk creator.
But this is available and IMHO there's no reasons for not patching it.

What's your opinion, Cesare? you're more experienced than me, so, i'll listen surely your suggestions.
(anyway i'm going on to remake the right diff...)

We better patch it then, because I have the impression that there is no official support for yaird (at least this https://bugs.edge.launchpad.net/ubuntu/+source/yaird/+bug/129828/comments/1 seems to imply so).

ok. let's do it. ;)

Cesare, take a look if now I done all and well... thanks. ;)

Looks good to me. Have you checked that it builds and installs correctly in an hardy environment?
Please attach a build log and installation report.

The build log is attached, here's the install through dpkg:

# dpkg -i yaird_0.0.12-24ubuntu1_i386.deb
(Reading database ... 26066 files and directories currently installed.)
Preparing to replace yaird 0.0.12-23ubuntu1 (using yaird_0.0.12-24ubuntu1_i386.deb) ...
Unpacking replacement yaird ...
Setting up yaird (0.0.12-24ubuntu1) ...
Installing new version of config file /etc/yaird/Templates.cfg ...

thanks.

Uploaded, thanks for your contribution.

yaird (0.0.12-24ubuntu1) hardy; urgency=low

  * Merge from Debian unstable. Remaining Ubuntu changes:
        - debian/control:
            + changing maintainter to "Ubuntu MOTU Developers"
        - debian/mkinitrd.yaird
            + update-initramfs compatibility

yaird (0.0.12-24) unstable; urgency=medium

  * Add patch 1022 to fix passing dashed options to run_init. Closes:
    bug#416927, thanks to Michael Biebl and Roderick Schupp.
  * Raising to urgency=medium as this may have been the cause of various
    other problems passing dashed boot options to userspace tools.

yaird (0.0.12-23) unstable; urgency=low

  * Add Vcs-Svn and Vcs-Browser fields to debian/control.
  * Move Homepage to own field (from pseudo-field in long description).
  * Add patch 1021 to support new-style IEEE1394 (Firewire) driver.
  * Rewrite long description and add README.Debian, emphasizing that
    yaird produces highly optimized ramdisks useful for stable systems,
    and suggesting initramfs-tools for flexible ramdisk needs. Closes:
    bug#444253, #346134, #392072.
  * Update debian/copyright:
    + Rewrite to conform to proposed new format at
      http://wiki.debian.org/Proposals/CopyrightFormat .
    + Drop unneeded disclaimer.

 -- Andrea Gasparini <email address hidden> Thu, 25 Oct 2007 20:20:31 +0200