#
#
# patch "NEWS"
#  from [484b452c3d0c799f2213a52223a1e0373b70bc12]
#    to [1906aeba854db64c27e2f183041338dbeb7629f0]
# 
# patch "UPGRADE"
#  from [34eab337ec76974bbaa05452f08d08bb573071f4]
#    to [82a6a37f8de5e96c6d50ea34fd051385243dbde1]
# 
# patch "configure.ac"
#  from [81d3d689b13f3b20219b8eace2fc50074df86f1a]
#    to [a8ce698bf84b52be78876eaa51597dd9e11f954f]
# 
# patch "monotone.spec"
#  from [9fd55e5ec1d9d07733cb0822bf7ea296460af776]
#    to [e3702204cf048ca25bcd3ebebc7d07821235249b]
# 
# patch "visualc/config.h"
#  from [e002953d0ac75705683a837ac01ffdacb73a044b]
#    to [335b4d4550a3ff867dbaa58329c86b5d374d9c5b]
# 
# patch "win32/monotone.iss"
#  from [438bd78b53e039a6c571d583cbd44a2ba2318bed]
#    to [354842bbaab42fe67402005bd30a368681cd26de]
#
============================================================
--- NEWS	484b452c3d0c799f2213a52223a1e0373b70bc12
+++ NEWS	1906aeba854db64c27e2f183041338dbeb7629f0
@@ -1,4 +1,4 @@
-??? ???  ? ??:??:?? UTC 2008
+Fri Dec 26 22:08:00 UTC 2008
 
         0.42 release.
 
============================================================
--- UPGRADE	34eab337ec76974bbaa05452f08d08bb573071f4
+++ UPGRADE	82a6a37f8de5e96c6d50ea34fd051385243dbde1
@@ -1,4 +1,4 @@
-upgrading monotone to 0.41
+upgrading monotone to 0.42
 ==========================
 
 How to read this file:
============================================================
--- configure.ac	81d3d689b13f3b20219b8eace2fc50074df86f1a
+++ configure.ac	a8ce698bf84b52be78876eaa51597dd9e11f954f
@@ -2,7 +2,7 @@ AC_PREREQ(2.58)
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.58)
-AC_INIT(monotone, 0.41, address@hidden)
+AC_INIT(monotone, 0.42, address@hidden)
 AM_INIT_AUTOMAKE([1.9 tar-ustar std-options])
 AC_CONFIG_SRCDIR([app_state.cc])
 AM_CONFIG_HEADER([config.h])
@@ -67,8 +67,8 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h ne
 dnl Explicitly specifying AC_INCLUDES_DEFAULT gets autoconf not to do all
 dnl the tests twice.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/file.h \
-		  sys/socket.h sys/time.h termios.h errno.h],,,
-		 [AC_INCLUDES_DEFAULT()])
+          sys/socket.h sys/time.h termios.h errno.h],,,
+         [AC_INCLUDES_DEFAULT()])
 AC_HEADER_STDBOOL
 
 # gettext is nominally a library, but its tests don't work in C++ mode.
@@ -90,12 +90,12 @@ AC_OUTPUT_COMMANDS([
       # PO directories have a Makefile.in generated from Makefile.in.in.
       case "$ac_file" in */Makefile.in)
         target="`echo x$ac_file | sed -e 's/.in$//' -e 's/^x//'`"
-	mtn_tmp="${target}.tmp"
+    mtn_tmp="${target}.tmp"
         test -n "$as_me" && echo "$as_me: fixing $target" || echo "fixing $target"
-	sed -e 's/^MSGMERGE =.*$/MSGMERGE = false/' \
+    sed -e 's/^MSGMERGE =.*$/MSGMERGE = false/' \
             -e 's/^MSGMERGE_UPDATE =.*$/MSGMERGE_UPDATE = true/' \
                "$target" > "$mtn_tmp"
-	mv -f "$mtn_tmp" "$target" ;;
+    mv -f "$mtn_tmp" "$target" ;;
       esac
     done
 ])
@@ -121,11 +121,11 @@ AC_CHECK_MEMBERS([struct stat.st_ctim.tv
 AC_TYPE_PID_T
 
 AC_CHECK_MEMBERS([struct stat.st_ctim.tv_nsec,
-	          struct stat.st_mtim.tv_nsec,
-		  struct stat.st_ctimespec.tv_nsec, 
-	          struct stat.st_mtimespec.tv_nsec,
-		  struct stat.st_ctimensec,
-		  struct stat.st_mtimensec])
+              struct stat.st_mtim.tv_nsec,
+          struct stat.st_ctimespec.tv_nsec,
+              struct stat.st_mtimespec.tv_nsec,
+          struct stat.st_ctimensec,
+          struct stat.st_mtimensec])
 AC_CHECK_MEMBERS([struct dirent.d_type], , ,[#include <dirent.h>])
 
 # Checks for library functions.
@@ -134,7 +134,7 @@ AC_CHECK_FUNCS([atexit memset mkstemp st
 AC_FUNC_LOCALE_WORKS
 AC_FUNC_ICONV_TRANSLIT
 AC_CHECK_FUNCS([atexit memset mkstemp strptime lrint \
-		__cxa_current_exception_type __cxa_demangle \
+        __cxa_current_exception_type __cxa_demangle \
                 putenv setenv unsetenv dirfd fstatat mkdtemp])
 
 # simple library checks
============================================================
--- monotone.spec	9fd55e5ec1d9d07733cb0822bf7ea296460af776
+++ monotone.spec	e3702204cf048ca25bcd3ebebc7d07821235249b
@@ -1,6 +1,6 @@ Name: monotone
 Summary: monotone is a distributed version control tool
 Name: monotone
-Version: 0.41
+Version: 0.42
 Release: 0.mtn.2%{?dist}
 License: GPL
 Group: Development/Tools
@@ -59,6 +59,9 @@ fi
 
 
 %changelog
+* Fri Dec 26 Thomas Keller <address@hidden>
+- 0.42 release.
+
 * Wed Sep 03 Thomas Keller <address@hidden>
 - 0.41 release.
 
============================================================
--- visualc/config.h	e002953d0ac75705683a837ac01ffdacb73a044b
+++ visualc/config.h	335b4d4550a3ff867dbaa58329c86b5d374d9c5b
@@ -2,10 +2,10 @@
 #define CONFIG_H 1
 
 #define PACKAGE "monotone"
-#define PACKAGE_STRING "monotone 0.41"
+#define PACKAGE_STRING "monotone 0.42"
 #define PACKAGE_BUGREPORT "address@hidden"
 #define LC_MESSAGES LC_CTYPE
-#define VERSION "0.41"
+#define VERSION "0.42"
 
 #ifdef _MSC_VER
 typedef unsigned long pid_t;
@@ -59,8 +59,8 @@ typedef unsigned int os_err_t;
  * Disable MS specific warning C4290:
  * C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
  *
- * A function is declared using exception specification, which Visual C++ accepts but does not implement. 
- * Code with exception specifications that are ignored during compilation may need to be recompiled and 
+ * A function is declared using exception specification, which Visual C++ accepts but does not implement.
+ * Code with exception specifications that are ignored during compilation may need to be recompiled and
  * linked to be reused in future versions supporting exception specifications.
  */
 #pragma warning( disable : 4290 )
@@ -70,11 +70,11 @@ typedef unsigned int os_err_t;
  * Disable MS specific warning C4250:
  * Two or more members have the same name. The one in class2 is inherited because it is a base class
  * for the other classes that contained this member.
- * Because a virtual base class is shared among multiple derived classes, a name in a derived class 
- * dominates a name in a base class. 
- * For example, given the following class hierarchy, there are two definitions of func inherited within diamond: 
- * the vbc::func() instance through the weak class, and the dominant::func() through the dominant class. 
- * An unqualified call of func() through a diamond class object, always calls the dominate::func() instance. 
+ * Because a virtual base class is shared among multiple derived classes, a name in a derived class
+ * dominates a name in a base class.
+ * For example, given the following class hierarchy, there are two definitions of func inherited within diamond:
+ * the vbc::func() instance through the weak class, and the dominant::func() through the dominant class.
+ * An unqualified call of func() through a diamond class object, always calls the dominate::func() instance.
  * If the weak class were to introduce an instance of func(), neither definition would dominate, and the call would be flagged as ambiguous.
  */
 #pragma warning( disable : 4250 )
============================================================
--- win32/monotone.iss	438bd78b53e039a6c571d583cbd44a2ba2318bed
+++ win32/monotone.iss	354842bbaab42fe67402005bd30a368681cd26de
@@ -1,5 +1,5 @@
 #define APPNAME="monotone"
-#define APPVERS="0.41"
+#define APPVERS="0.42"
 
 [Setup]
 AppName={#APPNAME}
@@ -27,10 +27,7 @@ Source: "..\po\es.gmo"; DestDir: "{app}\
 Source: "..\COPYING"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\po\de.gmo"; DestDir: "{app}\locale\de\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion
 Source: "..\po\es.gmo"; DestDir: "{app}\locale\es\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion
-Source: "..\po\fr.gmo"; DestDir: "{app}\locale\fr\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion
 Source: "..\po\it.gmo"; DestDir: "{app}\locale\it\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion
-Source: "..\po\ja.gmo"; DestDir: "{app}\locale\ja\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion
-Source: "..\po\pt_BR.gmo"; DestDir: "{app}\locale\pt_BR\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion
 Source: "..\po\sv.gmo"; DestDir: "{app}\locale\sv\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion
 Source: "\mingw\bin\libiconv-2.dll"; DestDir: "{app}"
 Source: "\mingw\bin\libintl-8.dll"; DestDir: "{app}"