Merge lp:~bialix/bzr-windows-installers/trunk into lp:bzr-windows-installers

Proposed by Alexander Belchenko
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bialix/bzr-windows-installers/trunk
Merge into: lp:bzr-windows-installers
Diff against target: None lines
To merge this branch: bzr merge lp:~bialix/bzr-windows-installers/trunk
Reviewer Review Type Date Requested Status
Bazaar Developers Pending
Review via email: mp+11926@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Belchenko (bialix) wrote :

critical updates.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/win32/buildout.cfg'
2--- tools/win32/buildout.cfg 2009-09-15 03:41:54 +0000
3+++ tools/win32/buildout.cfg 2009-09-16 19:45:51 +0000
4@@ -79,12 +79,12 @@
5 bzrtools-release-tag = tag:release-${settings:bzrtools-release}
6 bzrtools-trunk-url = lp:bzrtools
7
8-qbzr-release = 0.14.1
9+qbzr-release = 0.14.2
10 qbzr-release-tag = tag:release-${settings:qbzr-release}
11 qbzr-release-url = lp:qbzr/0.14
12 qbzr-trunk-url = lp:qbzr
13
14-bzr-explorer-release = 0.8.0
15+bzr-explorer-release = 0.8.1
16 bzr-explorer-release-tag = tag:release-${settings:bzr-explorer-release}
17 bzr-explorer-trunk-url = lp:bzr-explorer
18
19
20=== modified file 'tools/win32/bzr.iss.cog'
21--- tools/win32/bzr.iss.cog 2009-09-15 03:23:59 +0000
22+++ tools/win32/bzr.iss.cog 2009-09-16 19:30:54 +0000
23@@ -199,7 +199,7 @@
24
25
26 [Icons]
27-Name: "{group}\Bazaar Explorer"; Filename: "bzr"; WorkingDir: {sd}\; Parameters: "explorer"; Components: explorer;
28+Name: "{group}\Bazaar Explorer"; Filename: "{app}\bzr.exe"; WorkingDir: {sd}\; Parameters: "explorer"; Components: explorer;
29 Name: "{group}\User Documentation"; Filename: "{app}\bzr-en.chm"; Components: doc\en;
30 Name: "{group}\User Documentation - Spanish"; Filename: "{app}\bzr-es.chm"; Components: doc\es;
31 Name: "{group}\User Documentation - Russian"; Filename: "{app}\bzr-ru.chm"; Components: doc\ru;
32@@ -216,8 +216,8 @@
33 ; ]]]
34 ; [[[end]]]
35
36-Name: "{commondesktop}\Bazaar Explorer"; Filename: "bzr"; Parameters: "explorer"; WorkingDir: {sd}\; Tasks: desktopicon
37-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Bazaar Explorer"; Filename: "bzr"; Parameters: "explorer"; WorkingDir: {sd}\; Tasks: quicklaunchicon
38+Name: "{commondesktop}\Bazaar Explorer"; Filename: "{app}\bzr.exe"; Parameters: "explorer"; WorkingDir: {sd}\; Tasks: desktopicon
39+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Bazaar Explorer"; Filename: "{app}\bzr.exe"; Parameters: "explorer"; WorkingDir: {sd}\; Tasks: quicklaunchicon
40
41
42 [Tasks]
43@@ -227,7 +227,7 @@
44
45 ; [[[cog
46 ; if "TBZR" in os.environ:
47-; cog.outl('Name: TBZRReadme; Description: "View the TortoiseBZR Readme"; Components: tortoise')
48+; cog.outl('Name: TBZRReadme; Description: "View the TortoiseBZR Readme"; Components: tortoise; Flags: unchecked')
49 ; ]]]
50 ; [[[end]]]
51

Subscribers

People subscribed via source and target branches