~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-11 04:33:41 UTC
  • mfrom: (4797.33.4 2.1)
  • mto: This revision was merged to the branch mainline in revision 5082.
  • Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
    'version':      bzrlib.__version__,
38
38
    'author':       'Canonical Ltd',
39
39
    'author_email': 'bazaar@lists.canonical.com',
40
 
    'url':          'http://www.bazaar.canonical.com/',
 
40
    'url':          'http://bazaar.canonical.com/',
41
41
    'description':  'Friendly distributed version control system',
42
42
    'license':      'GNU GPL v2',
43
43
    'download_url': 'https://launchpad.net/bzr/+download',
553
553
                                     version = version_str,
554
554
                                     description = META_INFO['description'],
555
555
                                     author = META_INFO['author'],
556
 
                                     copyright = "(c) Canonical Ltd, 2005-2009",
 
556
                                     copyright = "(c) Canonical Ltd, 2005-2010",
557
557
                                     company_name = "Canonical Ltd.",
558
558
                                     comments = META_INFO['description'],
559
559
                                    )
624
624
            excludes.extend(["bzrlib.plugins." + d for d in dirs])
625
625
        x = []
626
626
        for i in files:
627
 
            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
 
627
            # Throw away files we don't want packaged. Note that plugins may
 
628
            # have data files with all sorts of extensions so we need to
 
629
            # be conservative here about what we ditch.
 
630
            ext = os.path.splitext(i)[1]
 
631
            if ext.endswith('~') or ext in [".pyc", ".swp"]:
628
632
                continue
629
633
            if i == '__init__.py' and root == 'bzrlib/plugins':
630
634
                continue