Please merge atlas 3.6.0-24 (universe) from Debian unstable (main)

Debdiff for the merge. Fixes a FTBFS on amd64. I test-built it on my ppa:
https://edge.launchpad.net/~showard314/+archive/ppa/+packages

It FTBFS on lpia, but does build on i386 and amd64.

Please explain why the patch is reversed? Even so, patching fails no matter what.

I don't know, it's wierd - the first half of the patch is reversed, but if you go ~ 1/2 down it reverses the reverse and become normal. For example:

In the middle of the patch:
--- atlas-3.6.0.orig/debian/patches/atlas-3.6.0_tune_blas_gemm_CASES_ATL_smm14x1x84_sseCU.c.dpatch
+++ atlas-3.6.0/debian/patches/atlas-3.6.0_tune_blas_gemm_CASES_ATL_smm14x1x84_sseCU.c.dpatch

at the very beginning of the patch:
--- atlas-3.6.0/config.c
+++ atlas-3.6.0.orig/config.c

I'll make another one and try to get a merge proposal up.

debdiff is acting weird, if someone could explain it, I'd appreciate it!

I redid the merge, and

$ debdiff atlas_3.6.0-22ubuntu2.dsc atlas_3.6.0-24ubuntu1.dsc > atlas_3.6.0-24ubuntu1.debdiff

creates a patch identical to above. 1/2 of the patch is "reversed" and 1/2 is normal.

$ patch -p1 ../atlas_3.6.0-24ubuntu1.debdiff

in the source directory runs indefinitely.

To get around that, I'm attaching a bzr diff and please see the merge at:
https://code.edge.launchpad.net/~showard314/ubuntu/lucid/atlas/mergeto3.6.0-24ubuntu1/+merge/14678
let me know if this works. I'll also put diffs of debian/ between ubuntu versions and between debian and ubuntu.

diff of debian/ for:

3.6.0-22ubuntu2 --> 3.6.0-24ubuntu1

diff of debian/ for:

3.6.0-24 --> 3.6.0-24ubuntu1

I figured out why the debdiff appeared to be reversed, although it wasn't.

The Debian maintainer switched from no patch system to dpatch. When you do a debdiff of such a change, the changes that existed in .diff.gz outside of debian/ appear as "Reverted" in the debdiff since we are "reverting" the changes outside of debian/ back to be what it is in .orig.tar.gz. This will make the patch appear reversed for part of it (it is removing the Debian maintainer changes that are now being applied with dpatch), and the debdiff will not be able to be applied to the source directory. To apply the patch, we would need to remove at "Reverted" stanzas and files from the debdiff. However, that is not necessary since the diff I have above (ubuntu_merge_atlas.diff) has already done that. Just applying the .diff will work (see the merge and ppa above).

Howards, thanks for your work! Next time, please remember to set the status of the bug so we can see something has been done to it!

This bug was fixed in the package atlas - 3.6.0-24ubuntu1

---------------
atlas (3.6.0-24ubuntu1) lucid; urgency=low

  * Merge from debian testing (LP: #377158), remaining changes:
    - Build using the default compilers.
    - Build against fixed blas, build cblas_i[cz]amax.c with -ffloat-store
      on ix86 archs.
    - Explicitely fail the build on armel; the build doesn't terminate
      on the buildds and keeps the buildd busy until an admin does kill
      the build manually.
 -- Scott Howard <email address hidden> Tue, 10 Nov 2009 00:10:09 -0500