Rev 5653: Merge 2.2 into 2.3 in http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

------------------------------------------------------------
revno: 5653 [merge]
revision-id: v.ladeuil+lp at free.fr-20110616183144-e012lhwlw562r1uc
parent: pqm at pqm.ubuntu.com-20110615194453-jnzh5voa3sjdm7qu
parent: pqm at pqm.ubuntu.com-20110525182215-rdt09veh6tfzmril
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3.4-dev
timestamp: Thu 2011-06-16 20:31:44 +0200
message:
  Merge 2.2 into 2.3
modified:
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
-------------- next part --------------
=== modified file 'setup.py'
--- a/setup.py	2010-12-26 13:19:11 +0000
+++ b/setup.py	2011-06-16 18:31:44 +0000
@@ -469,6 +469,12 @@
     packages.append('sqlite3')
 
 
+def get_fastimport_py2exe_info(includes, excludes, packages):
+    # This is the python-fastimport package, not to be confused with the
+    # bzr-fastimport plugin.
+    packages.append('fastimport')
+
+
 if 'bdist_wininst' in sys.argv:
     def find_docs():
         docs = []
@@ -661,6 +667,9 @@
     if 'svn' in plugins:
         get_svn_py2exe_info(includes, excludes, packages)
 
+    if 'fastimport' in plugins:
+        get_fastimport_py2exe_info(includes, excludes, packages)
+
     if "TBZR" in os.environ:
         # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
         # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and