lp:~pefarrell/spud/diamond-setup

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:spud at revision 519

Cian Wilson: Approve on 2012-02-29

Tim Greaves: Approve on 2012-02-29

Diff: 147 lines (+23/-23)

3 files modified

config.guess (+5/-4)
config.sub (+14/-5)
diamond/setup.py.in (+4/-14)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #942831: building packages from source and installing doesn't work

Undecided

Fix Released

Link a bug report

Related blueprints

519. By Patrick Farrell on 2012-02-29

Simplify the setup.py.in considerably

518. By Patrick Farrell on 2012-02-29

Don't pull 'shape' from child attributes, as the user shouldn't see it.

517. By Tim Greaves on 2012-02-28

Responding to bug lp:931800, this merge:

* Changes the call to setup.py from debian/rules to use --root=path as opposed
   to --root path
* Adds in parsing of sys.argv to pull out that root and use it as destdir

A test build on precise appears to behave nicely.

516. By Cian Wilson on 2012-02-27

Removing the downloaded flml default from diamond.

515. By Tim Greaves on 2012-02-10

When using diamond purely as a validation tool to check options files,
diamond.schema can be imported in environments which don't have a display but
do have gtk.gdk. An example of this would be the diamond_validation test case
in Fluidity.

As far as I can see there is no need to import gtk.gdk in diamond.schema as
it's not used, and removing it doesn't appear to break anything.

514. By Tim Greaves on 2012-02-01

Fix purely in build system addressing bug lp:888887 by removing the unused
(and now deprecated) call to svnversion.

513. By Tim Greaves on 2012-01-31

Prior to this fix, if libspud's configure was supplied with a prefix
and then diamond's setup.py was called in install mode with a different
prefix, the setup.py prefix would be ignored. This merge changes that
behaviour such that a prefix given to setup.py will override a prefix
supplied to configure.

This fixes bug lp:921608

512. By Florian Rathgeber on 2012-01-25

Make distclean actually clean everything.

511. By Patrick Farrell on 2012-01-25

Take the libtool raw files from Fedora 15, to update the libtool in the spud trunk as well. See lp:918235.

510. By Patrick Farrell on 2011-12-01

Merge the make-diamond-pick-up-attributes-of-real-vectors-and-tensors branch.