# # # patch "NEWS" # from [01290d503d1e6159beb747673cafa864fad4c66f] # to [4102d7e399b0d44fa250e7110072f5dd049a903d] # # patch "UPGRADE" # from [b7e014bfa58db309cb29c06816070168e602fd14] # to [ef451e84d9d3c847f9d1fde2f470a9d20cdd19a9] # # patch "configure.ac" # from [dfd46656e3d3d3ff80f7bd403c0f57c981e71cc5] # to [aca13afbe2bd515baa1facffd450a83ec1b0353c] # # patch "debian/changelog" # from [6a22d6445460b75dcb69732099b8025404047dad] # to [2f39643f77187a66d63ab350c896e794f3d78f33] # # patch "monotone.spec" # from [b033ca5be9dfbe9c92df799b0025909b6ba21155] # to [33f2392b00dc265340c5e65c0678a0552742e410] # # patch "visualc/config.h" # from [852edf1d237cdd1ddbd88e7ed5f47fe4846161d5] # to [d033fd670698ba66d9a17667367fed468a909266] # # patch "win32/monotone.iss" # from [39034d9615a77f58ffe55a5c04d22e95ec144002] # to [f4e5db04d93fa27c9d07f58f9738789df8b650b5] # ============================================================ --- NEWS 01290d503d1e6159beb747673cafa864fad4c66f +++ NEWS 4102d7e399b0d44fa250e7110072f5dd049a903d @@ -1,13 +1,9 @@ [ somewhen in the future ] 0.38 release. Changes - - Added the scripts of the following Lua-based contributed - Monotone extension commands to contrib/command/: - "mtn base", "mtn fuse", "mtn revision", "mtn conflicts". - - mtn log now prints a single dot for a project's root directory instead of an empty string. @@ -34,8 +30,17 @@ - Update Botan to 1.7.2. + - Moved the gzip implementation out of the Botan directory. + Other + - Added the scripts of the following Lua-based contributed + Monotone extension commands to contrib/command/: + "mtn base", "mtn fuse", "mtn revision", "mtn conflicts". + + - Added a hooks version of the contributed ciabot script, + contrib/ciabot_monotone_hookversion.lua + - The monotone manual is now licensed under the GPL rather than the GFDL. ============================================================ --- UPGRADE b7e014bfa58db309cb29c06816070168e602fd14 +++ UPGRADE ef451e84d9d3c847f9d1fde2f470a9d20cdd19a9 @@ -1,4 +1,4 @@ -upgrading monotone to 0.37 +upgrading monotone to 0.38 ========================== How to read this file: ============================================================ --- configure.ac dfd46656e3d3d3ff80f7bd403c0f57c981e71cc5 +++ configure.ac aca13afbe2bd515baa1facffd450a83ec1b0353c @@ -1,8 +1,8 @@ AC_PREREQ(2.58) # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.58) -AC_INIT(monotone, 0.37, address@hidden) +AC_INIT(monotone, 0.38, address@hidden) AM_INIT_AUTOMAKE([1.9 tar-ustar std-options]) AC_CONFIG_SRCDIR([app_state.cc]) AM_CONFIG_HEADER([config.h]) ============================================================ --- debian/changelog 6a22d6445460b75dcb69732099b8025404047dad +++ debian/changelog 2f39643f77187a66d63ab350c896e794f3d78f33 @@ -1,11 +1,15 @@ -monotone (0.38-1) UNRELEASED; urgency=low +monotone (0.38-1) unstable; urgency=low + [ Richard Levitte ] + * New upstream release. + + [ Zack Weinberg ] * monotone-server.postrm: Delete default.mtn~ on purge. (Closes: #455058) * Add Homepage: and Vcs-Browser: fields to debian/control. * Standards-Version: 3.7.3 (no changes required). - -- Zack Weinberg Tue, 11 Dec 2007 01:58:16 -0800 + -- Richard Levitte Wed, 12 Dec 2007 20:52:32 +0100 monotone (0.37-4) unstable; urgency=low ============================================================ --- monotone.spec b033ca5be9dfbe9c92df799b0025909b6ba21155 +++ monotone.spec 33f2392b00dc265340c5e65c0678a0552742e410 @@ -1,6 +1,6 @@ Name: monotone Summary: monotone is a distributed version control tool Name: monotone -Version: 0.37 +Version: 0.38 Release: 0.mtn.1%{?dist} License: GPL Group: Development/Tools @@ -58,6 +58,9 @@ fi %changelog +* Wed Dec 12 2007 Richard Levitte +- 0.38 release. + * Mon Nov 5 2007 Julio M. Merino Vidal - Fixed build of RPM package in Fedora by discarding info/dir. ============================================================ --- visualc/config.h 852edf1d237cdd1ddbd88e7ed5f47fe4846161d5 +++ visualc/config.h d033fd670698ba66d9a17667367fed468a909266 @@ -1,11 +1,11 @@ #ifndef CONFIG_H #define CONFIG_H 1 #define PACKAGE "monotone" -#define PACKAGE_STRING "monotone 0.37" +#define PACKAGE_STRING "monotone 0.38" #define PACKAGE_BUGREPORT "address@hidden" #define LC_MESSAGES LC_CTYPE -#define VERSION "0.37" +#define VERSION "0.38" #ifdef _MSC_VER typedef unsigned long pid_t; ============================================================ --- win32/monotone.iss 39034d9615a77f58ffe55a5c04d22e95ec144002 +++ win32/monotone.iss f4e5db04d93fa27c9d07f58f9738789df8b650b5 @@ -1,8 +1,8 @@ AppName=monotone [Setup] AppName=monotone -AppVersion=0.37 -AppVerName=monotone 0.37 -OutputBaseFileName=monotone-0.37-setup +AppVersion=0.38 +AppVerName=monotone 0.38 +OutputBaseFileName=monotone-0.38-setup AppCopyright=Copyright © 2002-2007 Graydon Hoare et al. AppPublisher=venge.net AppPublisherURL=http://www.monotone.ca/