# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bialix@ukr.net-20071026214915-5eacqh9k2ps6jagj
# target_branch: file:///C:/work/Bazaar/mydev/bzr.dev/
# testament_sha1: fa303a73f2b1508ce747d4ac524c22bb1004bf4b
# timestamp: 2007-10-27 00:49:31 +0300
# base_revision_id: pqm@pqm.ubuntu.com-20071026085609-c3r8skfrmjj21j0m
# 
# Begin patch
=== modified file 'Makefile'
--- Makefile	2007-10-24 08:00:25 +0000
+++ Makefile	2007-10-26 21:49:15 +0000
@@ -167,10 +167,15 @@
 
 # win32 Python's distutils-based installer
 # require to have Python interpreter installed on win32
-python-installer: docs
+py-inst-24: docs
 	python24 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
+
+py-inst-25: docs
 	python25 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
+python-installer: py-inst-24 py-inst-25
+
+
 copy-docs: docs
 	$(PYTHON) tools/win32/ostools.py copytodir README win32_bzr.exe/doc
 	$(PYTHON) tools/win32/ostools.py copytree $(WEB_DOCS) win32_bzr.exe

=== modified file 'tools/win32/bzr-win32-bdist-postinstall.py'
--- tools/win32/bzr-win32-bdist-postinstall.py	2007-08-02 10:28:36 +0000
+++ tools/win32/bzr-win32-bdist-postinstall.py	2007-10-26 21:49:15 +0000
@@ -132,3 +132,14 @@
                     args,
                     os.path.join(sys.exec_prefix, 'Scripts'))
     file_created(dst)
+
+    # uninstall shortcut
+    uninst = os.path.join(sys.exec_prefix, 'Removebzr.exe')
+    dst = os.path.join(fldr, 'Uninstall Bazaar.lnk')
+    create_shortcut(uninst,
+                    'Uninstall Bazaar',
+                    dst,
+                    '-u bzr-wininst.log',
+                    sys.exec_prefix,
+                    )
+    file_created(dst)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTaF2lIAAk//gEAQQABZ5///
cgISAL////BQBP7mxkFKaXWXlq1vCSgiaZJtGKeQyGTJppR+qD1HqGgA0kTNRtTCD1GTCGQZNqaa
aBoMglBASno1PKDQ9TQaANAaaAAJIkKb1AyTRgmTRgIYAgwmCSQEAE0wo9JqnhT1N6FNqeoyZPUe
iPcwMssMbOGfL7jH1n7HlvVZWv80RUqUyi1rpUQeCjjdZDPCMIzeVWvRAHELrSG2mkziqKh66kdc
Gk9riPbBVZ90VJGs+F+bOc1Eva791jDLpNhqb/G4euWLihvrp9s3dKpZ+e6G8e1sc4Dd9LkLDdc/
TN+MYGMrsayI6Ebnn4gNT3GPI6rjPQqIJgXrMBrpfJPJhD3ndaa1S8FDvKB1DEWAuiXq9cV1zumP
9kRDkyZkfqYO1MxBzc0GBZEj3IER45aKwchVHyKZPpI7FSoniTSRRjQTOvDBKNkKPelilFMqwvcE
Xp5ItNMJLBzWysbaNQCwBo7QonnjuF0R6pQxkWJOva2LhhBDaQGaaD2GZkh0Sx7yhEDAgeZ4gT6u
NFrikbkaebiRQSHHC0sOWzyZE2xVDUnUOOtZnblI1yKTQe5YEYGvbHTrMR4EynJNtiUEYSAzVhWP
47T0JDhxcMsf9wNSRqXbDig0MBxUZgaUlyKlNUlI8CGTFJjlxHS0M+BdwCJURIlRiBPMPEvJsoI7
uQSOXNMLyUy0JjUWuGSdUJlBqdk6yiYFJxKKpmAMVHLsWdSrKDO8CgfSTHFxYSKSR3gPdWQm1DdT
uDLEIKhXIlyOfqVqieKmYx47moK02wqKMLBTH0TRxPJiau8OhOsQhcRQx9r06FTeSkVjNe5G4+3e
6RJi8gLtOs7D4GKzuPynG1YGWo682R0A9PdeiRkIzTOlvgrUp7F6DjvLioQi93vHEZkPYXhkO6kJ
4zwMAYbZ3RmydvGT/FHsxcci9OMzE8zxPQsIHEiX8+zfZ3zDi8Dh8f2P7lcs7zoWg8JDsy0WJrvZ
UToyO5c1wI0T+30kepujTgw1j8LRpAOri7HpkQL6mNjOLNaeh2sArgMasocpw6j2EYU/ULtEYEkZ
niaQaMCUJLQRDEQB8VoRBVIXm4tGKs1LyaFiXdBxMdJnhvWHLBJfnn6n4AdWKboD01yTZCOqTW+Q
omq0EOMLz8hihrGpPMGRNOn9vjPamPAoZLuQXrswP0ERG6Aeq9lAWgZkSvO9nEq8gXBKuKH/ARtC
4YoAiv2dREq/6iERnMstFzGq4sikIrhhrFqZUqPDMppGGIMODAYVCCGaE6Q+SwP2HLFOoTzICDMm
YUqdOo7XG+JlkfM4BHmbGoM9KNWCGKFd83qoaqd+2hsBvvuGBFUBT11lXkv6pPAssG+YFqu82bvc
7YDmYC4c7qGU1ptoiA8pgQotu1FGo0pUS7ChidJokXJOyrjWGswkMxwHK45/ceNMCVIzdDHfiMrV
iN4IGKFSCJctMMiZkiFdRRIZn468U9A8WdOIYX7evSRb9AkkSToGEcgnA0J4sRKVsyKEwygwTMUT
jtIq+qp09hHLxTKWKbRtV5PMqkDOuU9B4b6xVAlcygTjyojLa+mFxrkSolUrgh/i7kinChIG0LtK
QA==