# # # patch "ChangeLog" # from [3a7249dab22432bb5ae847f00c252b6af98d45c8] # to [51a4a7a3d358e4a4db4b823c35a8963d1a7d7e19] # # patch "UPGRADE" # from [e166d404518c87535d3ec993e944ae4d42029448] # to [754d606a208a185f7ec5e08b5060d4bafb785395] # # patch "configure.ac" # from [8711952941faf11a8656d77dd1b7493e85642e2a] # to [dc18dea85941b866f1520a9c787296cd87417369] # # patch "debian/changelog" # from [1b988778e7ac5f4ac6f7ded12ccee3a087dd7783] # to [8a63fe372bfe66451f9a68c438629a8fb9cdfc13] # # patch "monotone.spec" # from [50e28571d289fde51c5627ddd5e2480e759146d3] # to [fda2a1716eb3a8ec7d57f672a40b93c8d772a107] # # patch "visualc/config.h" # from [9118bd83268ccbe5455d4e89734fbcc14a439ac3] # to [fd06b6442b0ee7cc36587476c38df6f7509d7c45] # # patch "win32/monotone.iss" # from [41b64cf495f881deb7f483d22937c66e5def0770] # to [6f1eb7fc98cad33c5d977477328195d7fb3b061c] # ============================================================ --- ChangeLog 3a7249dab22432bb5ae847f00c252b6af98d45c8 +++ ChangeLog 51a4a7a3d358e4a4db4b823c35a8963d1a7d7e19 @@ -1,5 +1,11 @@ 2006-11-10 Nathaniel Smith + * UPGRADE, configure.ac, monotone.spec, debian/changelog: + * win32/monotone.iss, visualc/config.h: Bump version numbers to + 0.31. + +2006-11-10 Nathaniel Smith + * INSTALL: Remove libboost-program-options-dev from the list of debian packages. ============================================================ --- UPGRADE e166d404518c87535d3ec993e944ae4d42029448 +++ UPGRADE 754d606a208a185f7ec5e08b5060d4bafb785395 @@ -1,4 +1,4 @@ -upgrading monotone to 0.30 +upgrading monotone to 0.31 ========================== How to read this file: ============================================================ --- configure.ac 8711952941faf11a8656d77dd1b7493e85642e2a +++ configure.ac dc18dea85941b866f1520a9c787296cd87417369 @@ -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.30, address@hidden) +AC_INIT(monotone, 0.31, address@hidden) AM_INIT_AUTOMAKE([1.9 tar-ustar std-options]) AC_CONFIG_SRCDIR([app_state.cc]) AM_CONFIG_HEADER([config.h]) ============================================================ --- debian/changelog 1b988778e7ac5f4ac6f7ded12ccee3a087dd7783 +++ debian/changelog 8a63fe372bfe66451f9a68c438629a8fb9cdfc13 @@ -1,3 +1,9 @@ +monotone (0.31-0.1) unstable; urgency=low + + * New upstream release. + + -- Nathaniel Smith Fri, 10 Nov 2006 21:57:59 -0800 + monotone (0.30-0.1) unstable; urgency=low * New upstream release. ============================================================ --- monotone.spec 50e28571d289fde51c5627ddd5e2480e759146d3 +++ monotone.spec fda2a1716eb3a8ec7d57f672a40b93c8d772a107 @@ -1,14 +1,14 @@ Name: monotone Summary: monotone is a distributed version control tool Name: monotone -Version: 0.30 +Version: 0.31 Release: 0.mtn.1%{?dist} License: GPL Group: Development/Tools URL: http://www.venge.net/monotone Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: boost-devel >= 1.32.0, texinfo, zlib-devel -Requires: boost >= 1.32.0 +BuildRequires: boost-devel >= 1.33.1, texinfo, zlib-devel +Requires: boost >= 1.33.1 %description monotone is a free, distributed version control system. It provides @@ -58,6 +58,9 @@ fi %changelog +* Fri Nov 10 2006 nathaniel smith +- 0.31 release + * Sun Sep 17 2006 nathaniel smith - 0.30 release ============================================================ --- visualc/config.h 9118bd83268ccbe5455d4e89734fbcc14a439ac3 +++ visualc/config.h fd06b6442b0ee7cc36587476c38df6f7509d7c45 @@ -1,11 +1,11 @@ #ifndef CONFIG_H #define CONFIG_H 1 #define PACKAGE "monotone" -#define PACKAGE_STRING "monotone 0.30" +#define PACKAGE_STRING "monotone 0.31" #define PACKAGE_BUGREPORT "address@hidden" #define LC_MESSAGES LC_CTYPE -#define VERSION "0.30" +#define VERSION "0.31" #ifdef _MSC_VER typedef unsigned long pid_t; ============================================================ --- win32/monotone.iss 41b64cf495f881deb7f483d22937c66e5def0770 +++ win32/monotone.iss 6f1eb7fc98cad33c5d977477328195d7fb3b061c @@ -1,8 +1,8 @@ AppName=monotone [Setup] AppName=monotone -AppVersion=0.30 -AppVerName=monotone 0.30 -OutputBaseFileName=monotone-0.30-setup +AppVersion=0.31 +AppVerName=monotone 0.31 +OutputBaseFileName=monotone-0.31-setup AppCopyright=Copyright © 2002-2006 Graydon Hoare et al. AppPublisher=venge.net AppPublisherURL=http://venge.net/monotone