Please merge maximus (0.4.14-1) from Debian Testing

Applies cleanly on -p0:

$ patch -p0 < debian_maximus.diff
patching file data/maximus-autostart.desktop
patching file debian/changelog
patching file debian/control
patching file debian/maximus.install
patching file debian/maximus.postinst
patching file debian/maximus.preinst
patching file debian/source_maximus.py
$

Thanks for reporting this bug and any supporting documentation. Since this bug has enough information provided for a developer to begin work, I'm going to mark it as confirmed and let them handle it from here. Thanks for taking the time to make Ubuntu better!

Changed Back to New per policy.

Unfortunately the patch does not apply any more?

daniel@miyazaki:~/maximus-0.4.14$ patch -p1 < ../debian_maximus.diff
patching file maximus-autostart.desktop
Hunk #1 FAILED at 8.
1 out of 1 hunk FAILED -- saving rejects to file maximus-autostart.desktop.rej
patching file changelog
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 14.
Hunk #3 FAILED at 84.
3 out of 3 hunks FAILED -- saving rejects to file changelog.rej
patching file control
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file control.rej
patching file maximus.install
patching file maximus.postinst
patching file maximus.preinst
patching file source_maximus.py
daniel@miyazaki:~/maximus-0.4.14$

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/01/2010 07:12 AM, Daniel Holbach wrote:
> Unfortunately the patch does not apply any more?
>
> daniel@miyazaki:~/maximus-0.4.14$ patch -p1 < ../debian_maximus.diff
> patching file maximus-autostart.desktop
> Hunk #1 FAILED at 8.
> 1 out of 1 hunk FAILED -- saving rejects to file maximus-autostart.desktop.rej
> patching file changelog
> Hunk #1 FAILED at 1.
> Hunk #2 FAILED at 14.
> Hunk #3 FAILED at 84.
> 3 out of 3 hunks FAILED -- saving rejects to file changelog.rej
> patching file control
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file control.rej
> patching file maximus.install
> patching file maximus.postinst
> patching file maximus.preinst
> patching file source_maximus.py
> daniel@miyazaki:~/maximus-0.4.14$
>

Sorry Daniel, I am unable to understand why it doesn't work, I am
attaching a little log file that shows the process I went through and it
works fine. Also in Debian, I just noticed a new patch [1] that someone
made and it hasn't been included into this package so this diff I am
making would be kind of useless.

[1] http://packages.qa.debian.org/m/maximus.html

- --
Regards,
Vikram Dhillon

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkuTBdIACgkQcoBavQdRHcyKpQCfTGZAhrx3w3BWPY7yCvQ/mFIP
cxwAoMw/4+qHMIWhcH5piUle/Gybf/bw
=YQP0
-----END PGP SIGNATURE-----

Regarding the patch: sorry, my mistake.

A few things:
 - The merged version should be 04.14-1ubuntu1.
 - I think you have the changelog entries also a bit wrong. "remaining changes" should list all the changes that we have on top of the debian version.

(I don't see how your patch does these things for example:

+ - Bumped up the Standards version to 3.8.4
+ - Added VCS information
+ - Updated package description
+ - Removed x-window manager from Provides field and moved it to Depends

but there's a number of other things it does.

Debian has a patch in BTS that hasn't yet been incorporated into the package, so should I go on without the patch (we are already on feature freeze) or stop?

unsubscribed ubuntu-sponsors, please resubscribe once you have addressed Daniels reclamations.

You can incorporate the patch from the BTS if you want (but you don't have to) - it's just adding a Homepage entry to debian/control. The feature freeze will not prevent the merge, because you do not merge a new upstream release.