[Monotone-commits-diffs] net.venge.monotone.monotone-0.99: 814064853cfb2d8b3cf0eea5e5de51337cd20694

[code]

revision:            814064853cfb2d8b3cf0eea5e5de51337cd20694
date:                2010-12-05T02:39:33
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.monotone-0.99
changelog:
merge of '1fd95eb8da6b4209a8dcfa3cb49f56d11bf98076'
     and '66ddd0f2bb9bb0e98aafe1ddd3c5975a9102c4d1'

manifest:
format_version "1"

new_manifest [a8c817b378f5e321bbbeb2a2dec5a8fee310bd12]

old_revision [1fd95eb8da6b4209a8dcfa3cb49f56d11bf98076]

patch "Makefile.am"
 from [76cbdb6eb755172ea1300885c066bd83fa725a70]
   to [0c1e48ef9dfb72bc9f3ada23437e17c7fca73c18]

patch "win32/monotone.iss.in"
 from [38e480a83eb7115c91982b21516a29179e2a08a4]
   to [2a16720352f6ab65e7cdac63a870e5f6f6dd9770]

old_revision [66ddd0f2bb9bb0e98aafe1ddd3c5975a9102c4d1]

patch "configure.ac"
 from [b0df01d1555cd3723a38eb5ed0e06adbfd7ace43]
   to [1c8bcaf6c45619f96d6d3318ea4fa35447b1cccb]
============================================================
--- Makefile.am	76cbdb6eb755172ea1300885c066bd83fa725a70
+++ Makefile.am	0c1e48ef9dfb72bc9f3ada23437e17c7fca73c18
@@ -497,7 +497,7 @@ win32-installer: monotone-$(PACKAGE_VERS
 
 win32-installer: monotone-$(PACKAGE_VERSION)-setup.exe
 
-monotone-$(PACKAGE_VERSION)-setup.exe: mtn-stripped.exe html $(ALL_GMOFILES) linguas.iss dlls.iss monotone.iss
+monotone-$(PACKAGE_VERSION)-setup.exe: mtn-stripped.exe html info $(ALL_GMOFILES) linguas.iss dlls.iss monotone.iss
 	$(ISCC) monotone.iss
 
 mtn-stripped.exe: mtn.exe
============================================================
--- win32/monotone.iss.in	38e480a83eb7115c91982b21516a29179e2a08a4
+++ win32/monotone.iss.in	2a16720352f6ab65e7cdac63a870e5f6f6dd9770
@@ -28,10 +28,10 @@ Source: "{#BUILDDIR}\mtn-stripped.exe"; 
 
 [Files]
 Source: "{#BUILDDIR}\mtn-stripped.exe"; DestDir: "{app}"; DestName: "mtn.exe"; Flags: ignoreversion
-Source: "{#BUILDDIR}\monotone.html"; DestDir: "{app}\documentation"; Flags: ignoreversion
-Source: "{#BUILDDIR}\figures\*.png"; DestDir: "{app}\documentation\figures"; Flags: ignoreversion
-Source: "{#BUILDDIR}\images\*.png"; DestDir: "{app}\documentation\images"; Flags: ignoreversion
-Source: "{#SRCDIR}\texinfo.css"; DestDir: "{app}\documentation"; Flags: ignoreversion
+Source: "{#BUILDDIR}\html\*.html"; DestDir: "{app}\documentation\html"; Flags: ignoreversion
+Source: "{#BUILDDIR}\html\*.css"; DestDir: "{app}\documentation\html"; Flags: ignoreversion
+Source: "{#BUILDDIR}\html\figures\*.*"; DestDir: "{app}\documentation\html\figures"; Flags: ignoreversion
+Source: "{#BUILDDIR}\html\images\*.*"; DestDir: "{app}\documentation\html\images"; Flags: ignoreversion
 Source: "{#SRCDIR}\COPYING"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SRCDIR}\monotone.info"; DestDir: "{app}\documentation"; Flags: ignoreversion
 Source: "{#SRCDIR}\monotone.info-1"; DestDir: "{app}\documentation"; Flags: ignoreversion
@@ -39,23 +39,21 @@ Source: "{#SRCDIR}\monotone.info-3"; Des
 Source: "{#SRCDIR}\monotone.info-3"; DestDir: "{app}\documentation"; Flags: ignoreversion
 
 ; this file is generated by Makefile target "win32/dlls.iss"
-; it creates list of distribuable DLLs in form
-; Source: "some_dll.dll"; DestDir: "{app}"; Flags: ignoreversion
+; it creates list of distributable DLLs 
 #include "dlls.iss"
 
 ; the same but for language files
 #include "linguas.iss"
 
-
 [Tasks]
 Name: modifypath; Description: "Add monotone to your path"; GroupDescription: "Get up and running"; Flags: unchecked
 Name: viewdocs; Description: "View the monotone documentation"; GroupDescription: "Get up and running"
 
 [Run]
-Filename: "{app}\documentation\monotone.html"; Tasks: viewdocs; Flags: shellexec nowait; WorkingDir: "{app}\documentation"
+Filename: "{app}\documentation\html\index.html"; Tasks: viewdocs; Flags: shellexec nowait; WorkingDir: "{app}\documentation\html"
 
 [Icons]
-Name: "{group}\monotone documentation"; Filename: "{app}\documentation\monotone.html"; WorkingDir: "{app}"
+Name: "{group}\monotone documentation"; Filename: "{app}\documentation\html\index.html"; WorkingDir: "{app}\documentation\html"
 
 [Code]
 function ModPathDir(): String;
============================================================
--- configure.ac	b0df01d1555cd3723a38eb5ed0e06adbfd7ace43
+++ configure.ac	1c8bcaf6c45619f96d6d3318ea4fa35447b1cccb
@@ -10,7 +10,7 @@ AC_PREREQ(2.58)
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.58)
-AC_INIT([monotone], [0.99.1], address@hidden)
+AC_INIT([monotone], [0.99.2], address@hidden)
 AM_INIT_AUTOMAKE([1.9 tar-ustar std-options])
 AC_CONFIG_SRCDIR([app_state.cc])
 AC_CONFIG_HEADERS([config.h])