[Monotone-commits-diffs] net.venge.monotone: dfcc35d17e1fa60294eed902ab51097c94a18b8b

[code]

revision:            dfcc35d17e1fa60294eed902ab51097c94a18b8b
date:                2010-11-06T02:36:10
author:              Timothy Brownawell  <address@hidden>
branch:              net.venge.monotone
changelog:
merge of '01d8388c4ba22c976699ba4fc825d2dcb55db6c8'
     and '991e0d35c8eb887abdb2498be03611744b7bf52b'

manifest:
format_version "1"

new_manifest [1e8897ae8b32d12f8b469c3929f2a02ca162ce9f]

old_revision [01d8388c4ba22c976699ba4fc825d2dcb55db6c8]

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

patch "win32/README"
 from [069beef4aba1e1f2798f05ea1e598ed6995b7f01]
   to [9683d80a2134629236725419a2bf59908d66769b]

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

old_revision [991e0d35c8eb887abdb2498be03611744b7bf52b]

patch "contrib/monotone-mail-notify.lua"
 from [ea2cb1993ff4d9858ef4938958d2e4bfb233638f]
   to [71329cf83f1a56aafea35a6b9f9190a25df258de]
============================================================
--- 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/README	069beef4aba1e1f2798f05ea1e598ed6995b7f01
+++ win32/README	9683d80a2134629236725419a2bf59908d66769b
@@ -20,20 +20,21 @@ autoreconf -i
 Build the release. In an MSYS shell:
 cd monotone-<version>
 autoreconf -i
-./configure
+./configure sqlite3_LIBS=-lsqlite3
 make win32-installer
 
 That builds "monotone-<version>-setup.exe" in current folder.
 
 NOTE:
-  If ISCC (Inno setup compiler) is not in PATH, what is very probable, then you
-  need instruct makefile about it's location:
+
+  If ISCC (Inno setup compiler) is not in PATH, then you must specify
+  its location:
   
     make win32-installer ISCC=/d/progs/InnoSetup5/ISCC.exe
 
 Publish the binary on the monotone website with proper permissions:
 
-chmod a+r monotone-<version>/win32/monotone-<version>-setup.exe
-scp -p monotone-<version>/win32/monotone-<version>-setup.exe address@hidden:~/<version>
+chmod a+r monotone-<version>-setup.exe
+scp -p monotone-<version>-setup.exe address@hidden:~/<version>
 
-Download from the web and test!
+Download from the web and test, both the installed mtn and the documentation.
============================================================
--- 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;
============================================================
--- contrib/monotone-mail-notify.lua	ea2cb1993ff4d9858ef4938958d2e4bfb233638f
+++ contrib/monotone-mail-notify.lua	71329cf83f1a56aafea35a6b9f9190a25df258de
@@ -302,7 +302,7 @@ do
 		     outputFileDat:write("key='" .. key .. "'\n")
 		     outputFileDat:close()
 
-		     outputFileHdr:write("BCC: " .. to .. "\n")
+		     outputFileHdr:write("To: " .. to .. "\n")
 		     outputFileHdr:write("From: " .. from .. "\n")
 		     outputFileHdr:write("Subject: " .. subject .. "\n")
 		     outputFileHdr:write("Reply-To: " .. reply_to .. "\n")