Ticket #10353: trac10353-sage_root.patch

File trac10353-sage_root.patch, 4.2 KB (added by fbissey, 9 years ago)

remeve reference to zodb in sage_root

  • COPYING.txt

    # HG changeset patch
    # User Francois Bissey <francois.bissey@canterbury.ac.nz>
    # Date 1357552984 -46800
    # Node ID bb636787398e155417950aa1247ba1369ebf10bf
    # Parent  d8df6a456a673838a4ffe998cf067ca45fc81302
    trac 10353: removing zodb references from the sage_root repo
    
    diff --git a/COPYING.txt b/COPYING.txt
    a b  
    9494twistedweb2                          MIT Free Software licence
    9595weave                                SciPy License (=Modified BSD)
    9696zlib                                 Custom (Modified BSD)
    97 zodb3                                ZPL
    9897 
    9998 
    10099CONTACT INFO:
     
    15221521 
    15231522 
    15241523================================================================================
    1525  
    1526 zodb3
    1527 :
    1528 (http://www.zope.org/Wikis/ZODB/)
    1529 Zope Public License
    1530 
    1531 This is GPL compatible according to
    1532    http://www.fsf.org/licensing/licenses/index_html#GPLCompatibleLicenses
    1533  
    1534 Zope is made available under the Zope Public License. This license seeks
    1535 to allow free use of Zope and its source given a few conditions for use.
    1536  
    1537 Our goals are to allow Zope to flourish as an open source project while
    1538 making sure that we get some credit for having originally developed Zope.
    1539  
    1540 The 2.1 version of the license is reusable. It supports having a consistent
    1541 license for Zope and third-party products without requiring 3rd-party
    1542 developers to assign copyright to Zope Corporation.
    1543  
    1544 It is important that add-on products for Zope be released under the ZPL.
    1545 Why? Two reasons:
    1546  
    1547 * The ZPL is a flexible license that supports both commercial and
    1548   non-commercial use of the software.
    1549 * If Zope add-on products are released under the ZPL, then users of
    1550   Zope and the add-on products only have one license to worry about.
    1551   Keeping track of many different licenses is a burden to users.
    1552  
    1553 Software can be released under multiple licenses. For example, software
    1554 can be released under both the ZPL and the GPL.
    1555  
    1556 We will update the Zope software to use ZPL 2.1. This does not change the
    1557 rules for contributing to the Zope software repository. Contributions to the
    1558 Zope repository will still be owned by "Zope Corporation and Contributors".
    1559  
    1560 To use the ZPL 2.1 license, just include the license with your software
    1561 and also include a separate copyright statement (sample).
    1562  
    1563 We have updated to the 2.1 version. The license though, like Zope itself,
    1564 is a work-in-progress. We would love to hear your ideas on the license.
    1565 Please send your comments on the license to legal@zope.com.
    1566  
    1567 This license has received OSD branding. Zope Corporation is working to
    1568 stay true to the spirit of the Open Source Definition and its stated
    1569 rationales. This license has been confirmed as GPL compatible by the FSF.
    1570  
    1571 ================================================================================
    1572  
  • spkg/install

    diff --git a/spkg/install b/spkg/install
    a b  
    438438TERMCAP=`newest_version termcap`
    439439ZLIB=`newest_version zlib`
    440440ZNPOLY=`newest_version zn_poly`
    441 ZODB=`newest_version zodb3`
    442441
    443442EOF
    444443
  • spkg/standard/deps

    diff --git a/spkg/standard/deps b/spkg/standard/deps
    a b  
    116116     $(INST)/$(TACHYON) \
    117117     $(INST)/$(TERMCAP) \
    118118     $(INST)/$(ZLIB) \
    119      $(INST)/$(ZNPOLY) \
    120      $(INST)/$(ZODB)
     119     $(INST)/$(ZNPOLY)
    121120
    122121# TOOLCHAIN consists of dependencies determined by spkg/install
    123122toolchain: $(TOOLCHAIN)
     
    441440$(INST)/$(PYGMENTS): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
    442441        +$(PIPE) "$(SAGE_SPKG) $(PYGMENTS) 2>&1" "tee -a $(SAGE_LOGS)/$(PYGMENTS).log"
    443442
    444 $(INST)/$(ZODB): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
    445         +$(PIPE) "$(SAGE_SPKG) $(ZODB) 2>&1" "tee -a $(SAGE_LOGS)/$(ZODB).log"
    446 
    447443# List all *build-time* dependencies of the Sage library.  These are,
    448444# on the one hand, programs needed for the build/install process of the
    449445# Sage library (e.g. SAGE_SCRIPTS, SCONS, MERCURIAL, JINJA2), and on the
     
    535531# setuptools forgets to update easy-install.pth during parallel
    536532# builds, so we build the relevant packages serially.
    537533
    538 $(INST)/$(SQLALCHEMY): $(INST)/$(ZODB)
    539534$(INST)/$(PYGMENTS): $(INST)/$(SQLALCHEMY)
    540535$(INST)/$(JINJA2): $(INST)/$(PYGMENTS)
    541536$(INST)/$(SPHINX): $(INST)/$(JINJA2)