Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge branch 'public/monoids/15289-indexed' into public/modules/fock_…
Browse files Browse the repository at this point in the history
…space

* public/monoids/15289-indexed: (100 commits)
  Updated Sage version to 6.2.beta4
  added documentation, patchlevel bump
  trac #15894 modif of two warnings
  delete cruft from the guava package
  trac #15893 review patch
  trac #15894 another backward change
  trac #15894 changin back the category names
  trac #15xxx proper names should start by a capital letter
  Fix changelog entry for ell_wp
  trac #15893: graphs.petersen_family
  Fixes to code from #9505.
  Fix the banner displayed by sage -h
  trac #15466: remove dead import
  trac #15795 line wrap
  trac #15795 redone with ( ::)
  Fraction to power series: doctests
  Fraction to power series conversion when the fraction coerces into the base ring
  15698: Allow construction of power series from fractions
  Create *unevaluated* integrals when converting sage integrals to sympy
  Use evaluate=False in SympyConverter too
  ...
  • Loading branch information
Travis Scrimshaw committed Mar 13, 2014
2 parents d2f6254 + a2996e0 commit 9fe7ae7
Show file tree
Hide file tree
Showing 236 changed files with 4,596 additions and 53,190 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Sage version 6.2.beta3, released 2014-03-03
Sage version 6.2.beta4, released 2014-03-11
11 changes: 0 additions & 11 deletions build/deps
Original file line number Diff line number Diff line change
Expand Up @@ -524,14 +524,3 @@ $(INST)/$(CVXOPT): $(INST)/$(NUMPY) \
$(INST)/$(CEPHES):
+$(PIPE) "$(SAGE_SPKG) $(CEPHES) 2>&1" "tee -a $(SAGE_LOGS)/$(CEPHES).log"

###############################################################################

# setuptools forgets to update easy-install.pth during parallel
# builds, so we build the relevant packages serially.

$(INST)/$(PILLOW): $(INST)/$(PKGCONFIG)
$(INST)/$(SQLALCHEMY): $(INST)/$(PILLOW)
$(INST)/$(PYGMENTS): $(INST)/$(SQLALCHEMY)
$(INST)/$(JINJA2): $(INST)/$(PYGMENTS)
$(INST)/$(SPHINX): $(INST)/$(JINJA2)
$(INST)/$(SAGENB): $(INST)/$(SPHINX)
85 changes: 1 addition & 84 deletions build/pkgs/cddlib/SPKG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,88 +38,5 @@ http://www.ifor.math.ethz.ch/staff/fukuda/

== Special Update/Build Instructions ==
From clean upstream sources:
* remove directories doc, examples/*, src-mathlink/*, autom4te.cache
* Important - when recreating spkg, must make sure to first use hard links
See Trac 11245, where this caused it to fail on Cygwin:
Instructions from Dima Pasechnik, where of course foo = cddlib-vers
/* on a Unix, with good tar: */
$ tar xjf foo.spkg
$ tar chjf foo.spkg foo/
$ tar xjf foo.spkg
$ sage -spkg foo

== Changelog ==

=== cddlib-094f.p11 (Jeroen Demeyer, 13 February 2012) ===
* Trac #12501: refresh autogenerated files using the
patches/refresh_autogenerated.sh script.

=== cddlib-094f.p10 (Karl-Dieter Crisman, 1st July 2011) ===
* Changed to hard links so that the package would build on Cygwin
See Trac 11245

=== cddlib-094f.p9 (Simon King, 10th Dec 2011) ===
* #12131: Use --libdir, to make the package work on openSUSE.

=== cddlib-094f.p8 (Volker Braun, 21th Sept 2010) ===
* Add command line option to cdd_both_reps to optionally skip
adjacency computations.
* Include a simple random number generator (taken from the GNU C
library) to ensure the same output ordering on different platforms,
see http://trac.sagemath.org/sage_trac/ticket/9926

=== cddlib-094f.p7 (Volker Braun, 7th June 2010) ===
* Rewrite of configure.ac and Makefile.am's
Now ./configure --with-gmp=<path> works.
* I added a script patches/refresh_autogenerated.sh that explains how
to update the autotools output.
* allfaces.c now gone for good, nobody used it.

=== cddlib-094f.p6 (Volker Braun, 20th April 2010) ===
* use Sage's gmp/mpir libraries, not /usr/local in Automake.am

=== cddlib-094f.p5 (David Kirkby, 25th February 2010) ===
* #8363 Remove pointless check for mpir, which is breaking on Solaris.
mpir is built long before cddlib (50 packages earlier), so its
hard to see why it should be checked. In any case, the dependancy
is already in spkg/standard/deps.
* Allow a 64-bit build on any platform, not just OS X by resolving the
usual use of SAGE64 which currently only works on OS X.

=== cddlib-094f.p4 (Volker Braun, Minh Van Nguyen, January 29th, 2010) ===
* renamed patches/cdd_both_reps-makefiles.patch -> patches/automake.patch
* added check for required mpir (aka GMP) to spkg-install
* added spkg-check
* corrected src/patching, see
http://trac.sagemath.org/sage_trac/ticket/8115 and
http://groups.google.com/group/sage-devel/browse_thread/thread/e599fd37de909264
* removed CFLAGS settings in spkg-install, not required.

=== cddlib-094f.p3 (Volker Braun, January 26th, 2010) ===
* libtool-ized
After implementing the changes, I found that tabbott proposed a
similar patch to the automake files earlier:
http://sagetrac.org/sage_trac/ticket/3304
* renamed configure.in -> configure.ac (preferred usage)

=== cddlib-094f.p2 (Volker Braun, Marshall Hampton, Alex Ghitza, January 25th, 2010) ===
* patch cdd_both_reps.c
* remove dist/
* clean up SPKG.txt
* updated makefiles and regenerated configure scripts
Note: For future reference, patches/cdd_both_reps-makefiles.patch
shows the changed automake-sources. This is already applied to src/

=== cddlib-094f (Sebastien Barthelemy, January 26th, 2009) ===
* using upstream version 094f

=== cddlib-094b.p3 (Michael Abshoff, September 22nd, 2008) ===
* add Solaris x86[-64] build support

=== cddlib-094b.p2 (Michael Abshoff, May 18th, 2008) ===
* add 64 bit support on OSX

=== ??? (Michael Abshoff, November 11th, 2007) ===
* add -L$SAGE_LOCAL/lib to CFLAGS to force linking against Sage's gmp
(issue reported by Justin Walker)
* remove directories doc, examples*, autom4te.cache

6 changes: 3 additions & 3 deletions build/pkgs/cddlib/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=cddlib-VERSION.tar.bz2
sha1=6f2ed53a78298521f1e59750161e0129213f893b
md5=ef586f07f14b0a13b1c508849daff425
cksum=810190426
sha1=7fb95db0f42c20edd4dde1835342c2b41b74f267
md5=a40a0f16ce81d152dcdda674aac966c3
cksum=200778222
2 changes: 1 addition & 1 deletion build/pkgs/cddlib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
094f.p11
094g.p0
3 changes: 0 additions & 3 deletions build/pkgs/cddlib/patches/Makefile.am

This file was deleted.

0 comments on commit 9fe7ae7

Please sign in to comment.