Rev 3639: (bialix) remove out-of-date options from Windows standalone installer. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3639
revision-id: pqm at pqm.ubuntu.com-20080818180008-9488xkn2acyv2obu
parent: pqm at pqm.ubuntu.com-20080816000954-t0401ff8s3ydnkr6
parent: bialix at ukr.net-20080818092936-aoyxitu1nj5zc4m8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-08-18 19:00:08 +0100
message:
  (bialix) remove out-of-date options from Windows standalone installer.
removed:
  tools/win32/survey.txt         survey.txt-20070809075950-sf265mgu9oog8jjb-1
modified:
  tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
    ------------------------------------------------------------
    revno: 3638.1.1
    revision-id: bialix at ukr.net-20080818092936-aoyxitu1nj5zc4m8
    parent: pqm at pqm.ubuntu.com-20080816000954-t0401ff8s3ydnkr6
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: win32installer
    timestamp: Mon 2008-08-18 12:29:36 +0300
    message:
      remove out-of-date options from Windows standalone installer.
    removed:
      tools/win32/survey.txt         survey.txt-20070809075950-sf265mgu9oog8jjb-1
    modified:
      tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
=== modified file 'tools/win32/bzr.iss.cog'
--- a/tools/win32/bzr.iss.cog	2008-08-14 01:41:30 +0000
+++ b/tools/win32/bzr.iss.cog	2008-08-18 09:29:36 +0000
@@ -42,7 +42,6 @@
 
 SetupIconFile="..\bzr.ico"
 InfoBeforeFile="..\tools\win32\info.txt"
-InfoAfterFile="..\tools\win32\survey.txt"
 
 VersionInfoCompany="Canonical Ltd."
 VersionInfoCopyright="Canonical Ltd., 2005-2008"
@@ -177,7 +176,6 @@
 
 [Tasks]
 Name: Path; Description: "Add {app} directory to PATH environment variable"
-Name: Shell; Description: "Add Bzr context menu to shell"; Flags: unchecked
 ; [[[cog
 ; if "TBZR" in os.environ:
 ;     cog.outl('Name: TBZRReadme; Description: "View the TortoiseBZR Readme"; Components: tortoise')
@@ -199,7 +197,6 @@
 [Run]
 Filename: "{app}\bzr_postinstall.exe"; Parameters: "--start-bzr"; Flags: skipifdoesntexist runhidden;
 Filename: "{app}\bzr_postinstall.exe"; Parameters: "--add-path"; Tasks: Path; Flags: skipifdoesntexist skipifsilent runhidden;
-Filename: "{app}\bzr_postinstall.exe"; Parameters: "--add-shell-menu"; Tasks: Shell; Flags: skipifdoesntexist skipifsilent runhidden;
 ; [[[cog
 ; if "TBZR" in os.environ:
 ;     cog.outl('Filename: "regsvr32.exe"; Parameters: "/s tbzr.dll"; WorkingDir: "{app}"; Components: tortoise; Description: "Registering Tortoise"; StatusMsg: "Registering Tortoise"')
@@ -209,12 +206,14 @@
 
 
 [UninstallRun]
+Filename: "{app}\bzr_postinstall.exe"; Parameters: "--delete-path --delete-shell-menu --silent"; Flags: skipifdoesntexist runhidden; 
 ; [[[cog
 ; if "TBZR" in os.environ:
 ;     cog.outl('Filename: "regsvr32.exe"; Parameters: "/u /s tbzr.dll"; WorkingDir: "{app}"; Components: tortoise; StatusMsg: "Unregistering Tortoise"; Flags: skipifdoesntexist')
 ; ]]]
 ; [[[end]]]
 
+
 [Code]
 const
   SHCNF_IDLIST = $0000;

=== removed file 'tools/win32/survey.txt'
--- a/tools/win32/survey.txt	2007-08-10 09:04:38 +0000
+++ b/tools/win32/survey.txt	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-
-If you would like to help us improve Bazaar by telling us about
-yourself and what we could do better, please register and 
-complete the online survey here: 
-http://www.surveymonkey.com/s.aspx?sm=L94RvLswhKdktrxiHWiX3g_3d_3d
-