# # # patch "UPGRADE" # from [128b39c8de9f33b4763cc69e06baba9ee10b06a2] # to [e535a17a2f948fd7ddee92916cf064439bc88584] # # patch "contrib/mtbrowse.sh" # from [2a9704fcdeaf79fa561666d2a00c79029d87de96] # to [4e9e5edb71155fb23f398213805ae8bd644cffd0] # # patch "debian/copyright" # from [6bc5a81189cd8b51e3c53e13a0c25ae212126caa] # to [bff6aab6446c5e06dc88f9896ce143397f5380ac] # # patch "debian/watch" # from [05b66dce251f681cf4ed5654ad94459180ca7bcd] # to [c01bea707b732c2662ea183bd2f0ff19b5e2c547] # # patch "monotone.spec" # from [b034165b73b6b851f12d7c46a4752e4530476181] # to [3ba7e686b815842368bc677f497d5ff7d40bfbe5] # # patch "tests/two_parent_workspace_commands_that_fail/__driver__.lua" # from [b93321cf3c64ca3d4e65aa71a1d17ade6248a97c] # to [ddb96c7133077b7166f21a65ad3d7e6bd97da49a] # # patch "win32/monotone.iss" # from [13d6d04aad81b6d82fc3e3844f2ae19fff9bf4c6] # to [877fe3aae23955c18291dc081af8503109fffe28] # ============================================================ --- UPGRADE 128b39c8de9f33b4763cc69e06baba9ee10b06a2 +++ UPGRADE e535a17a2f948fd7ddee92916cf064439bc88584 @@ -77,7 +77,7 @@ If you are upgrading from: "designated migrator", then it is still possible to preserve your branches. However, this requires some more understanding of what exactly is going on, and is outside the scope of this document. - See http://venge.net/monotone/wiki/RosterifyingPrivateBranches + See http://venge.net/mtn-wiki/RosterifyingPrivateBranches for one approach, and if you don't understand the logic behind those commands, then we're happy to explain things in more detail on the mailing list (address@hidden) or IRC (#monotone ============================================================ --- contrib/mtbrowse.sh 2a9704fcdeaf79fa561666d2a00c79029d87de96 +++ contrib/mtbrowse.sh 4e9e5edb71155fb23f398213805ae8bd644cffd0 @@ -1,8 +1,8 @@ #!/bin/sh # # File: mtbrowse.sh # Description: Text based browser for monotone source control. -# url: http://www.venge.net/monotone/ +# url: http://www.monotone.ca/ # Licence: GPL # Author: Henry Nestler # ============================================================ --- debian/copyright 6bc5a81189cd8b51e3c53e13a0c25ae212126caa +++ debian/copyright bff6aab6446c5e06dc88f9896ce143397f5380ac @@ -1,9 +1,9 @@ The source files was downloaded from This package was debianized by Tomas Fasth on 2005-04-12 and adopted by Shaun Jackman on 2006-07-24. The source files was downloaded from -http://www.venge.net/monotone/downloads +http://www.monotone.ca/downloads/ The upstream author is Graydon Hoare ============================================================ --- debian/watch 05b66dce251f681cf4ed5654ad94459180ca7bcd +++ debian/watch c01bea707b732c2662ea183bd2f0ff19b5e2c547 @@ -1,2 +1,2 @@ version=3 version=3 +http://www.monotone.ca/downloads/([\d\.]+)/ monotone-([\d\.]+)\.tar\.gz debian uupdate -http://www.venge.net/monotone/downloads/ monotone-([0-9.]*)\.tar\.gz debian uupdate ============================================================ --- monotone.spec b034165b73b6b851f12d7c46a4752e4530476181 +++ monotone.spec 3ba7e686b815842368bc677f497d5ff7d40bfbe5 @@ -1,10 +1,10 @@ Group: Development/Tools Summary: monotone is a distributed version control tool Name: monotone Version: 0.33 Release: 0.mtn.1%{?dist} License: GPL Group: Development/Tools -URL: http://www.venge.net/monotone +URL: http://www.monotone.ca/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: boost-devel >= 1.33.1, texinfo, zlib-devel ============================================================ --- tests/two_parent_workspace_commands_that_fail/__driver__.lua b93321cf3c64ca3d4e65aa71a1d17ade6248a97c +++ tests/two_parent_workspace_commands_that_fail/__driver__.lua ddb96c7133077b7166f21a65ad3d7e6bd97da49a @@ -1,6 +1,6 @@ -- Create a simple two-parent workspace and then run a bunch of -- commands all of which should give errors (but not I()s). --- see http://venge.net/monotone/wiki/MultiParentWorkspaceFallout +-- see http://venge.net/mtn-wiki/MultiParentWorkspaceFallout -- for rationales for failures mtn_setup() ============================================================ --- win32/monotone.iss 13d6d04aad81b6d82fc3e3844f2ae19fff9bf4c6 +++ win32/monotone.iss 877fe3aae23955c18291dc081af8503109fffe28 @@ -5,7 +5,7 @@ AppPublisher=venge.net OutputBaseFileName=monotone-0.33-setup AppCopyright=Copyright © 2002-2007 Graydon Hoare et al. AppPublisher=venge.net -AppPublisherURL=http://venge.net/monotone +AppPublisherURL=http://www.monotone.ca/ DefaultDirName={pf}\monotone DefaultGroupName=monotone MinVersion=4.0,4.0