Rev 3231: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

------------------------------------------------------------
revno: 3231
revision-id:robertc at robertcollins.net-20080221230321-v8cm2p91zd3vbvyv
parent: robertc at robertcollins.net-20080221053607-4jgwnpvx5s5hewhb
parent: robertc at robertcollins.net-20080221225343-lp5xf6hl5g91088a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: external_reference_tests
timestamp: Fri 2008-02-22 10:03:21 +1100
message:
  Merge bzr.dev.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3227.1.1
    revision-id:robertc at robertcollins.net-20080221225343-lp5xf6hl5g91088a
    parent: robertc at robertcollins.net-20080220002317-5bdinlaczri004x2
    parent: pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: errors
    timestamp: Fri 2008-02-22 09:53:43 +1100
    message:
      Merge bzr.dev.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3221.2.7
    revision-id:pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
    parent: pqm at pqm.ubuntu.com-20080219222102-rqz9oxck1qbibvkm
    parent: robertc at robertcollins.net-20080219041134-03amd7siou1c8ugw
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-02-20 01:40:08 +0000
    message:
      Add external references support attribute to repository formats.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
    ------------------------------------------------------------
    revno: 3221.2.6
    revision-id:pqm at pqm.ubuntu.com-20080219222102-rqz9oxck1qbibvkm
    parent: pqm at pqm.ubuntu.com-20080219014045-w3igijttjdcpwshz
    parent: bialix at ukr.net-20080219091728-qg1xo2i5r4r3u72w
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-02-19 22:21:02 +0000
    message:
      (bialix) Include quick-start-summary.svg file to python-based installer
       for Windows (bug #192924)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3221.5.1
    revision-id:bialix at ukr.net-20080219091728-qg1xo2i5r4r3u72w
    parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bugfix.192924
    timestamp: Tue 2008-02-19 11:17:28 +0200
    message:
      (bialix) Include quick-start-summary.svg file to python-based installer for Windows (bug #192924)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'NEWS'
--- a/NEWS	2008-02-20 03:00:28 +0000
+++ b/NEWS	2008-02-21 23:03:21 +0000
@@ -23,6 +23,9 @@
 
   BUGFIXES:
 
+    * Include quick-start-summary.svg file to python-based installer(s)
+      for Windows (#192924, Alexander Belchenko)
+
   API BREAKS:
 
   TESTING:
@@ -135,14 +138,14 @@
     * List possible values for BZR_SSH environment variable in env-variables
       help topic. (Alexander Belchenko, #181842)
 
-   * New methods ``push_log_file`` and ``pop_log_file`` to intercept messages:
-     popping the log redirection now precisely restores the previous state,
-     which makes it easier to use bzr log output from other programs.
-     TestCaseInTempDir no longer depends on a log redirection being established
-     by the test framework, which lets bzr tests cleanly run from a normal
-     unittest runner.
-     (#124153, #124849, Martin Pool, Jonathan Lange)
-
+    * New methods ``push_log_file`` and ``pop_log_file`` to intercept messages:
+      popping the log redirection now precisely restores the previous state,
+      which makes it easier to use bzr log output from other programs.
+      TestCaseInTempDir no longer depends on a log redirection being established
+      by the test framework, which lets bzr tests cleanly run from a normal
+      unittest runner.
+      (#124153, #124849, Martin Pool, Jonathan Lange)
+ 
     * ``pull --quiet`` is now more quiet, in particular a message is no longer
       printed when the remembered pull location is used. (James Westby,
       #185907)

=== modified file 'setup.py'
--- a/setup.py	2007-12-17 01:33:01 +0000
+++ b/setup.py	2008-02-19 09:17:28 +0000
@@ -237,7 +237,8 @@
         for root, dirs, files in os.walk('doc'):
             r = []
             for f in files:
-                if os.path.splitext(f)[1] in ('.html','.css','.png','.pdf'):
+                if (os.path.splitext(f)[1] in ('.html','.css','.png','.pdf')
+                    or f == 'quick-start-summary.svg'):
                     r.append(os.path.join(root, f))
             if r:
                 relative = root[4:]