diff options
| author | wiz <wiz> | 2009-03-22 09:40:01 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2009-03-22 09:40:01 +0000 |
| commit | 7771ad13bcc512197efdedc9970302ff8d585fad (patch) | |
| tree | fd169e3fcdde2fa4ce5914be71b389d56a9d6fba /devel | |
| parent | eada58271d431090c871a850313619810e4339f6 (diff) | |
| download | pkgsrc-7771ad13bcc512197efdedc9970302ff8d585fad.tar.gz | |
Update to 1.2.1:
This is a bugfix release.
* fixed version number build from tarball
* fix allow_read logic for hgweb
* improve handling of damaged revlogs in verify
* keep .orig files when resolving
* clear resolve state properly when rebasing
* improve --command handling with bisect
* fix diff against bundles
* improve fetch logic for inactive branches
* fix diffstat with notify
* fix 'synthetic file adds' in CVS conversion
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/mercurial/Makefile | 5 | ||||
| -rw-r--r-- | devel/mercurial/distinfo | 9 | ||||
| -rw-r--r-- | devel/mercurial/patches/patch-aa | 19 |
3 files changed, 6 insertions, 27 deletions
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index 10b3928ca5b..e0a987a4fe5 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2009/03/12 07:41:27 hasso Exp $ +# $NetBSD: Makefile,v 1.29 2009/03/22 09:40:01 wiz Exp $ # -DISTNAME= mercurial-1.2 -PKGREVISION= 1 +DISTNAME= mercurial-1.2.1 CATEGORIES= devel scm MASTER_SITES= http://www.selenic.com/mercurial/release/ diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo index 63be9f0234e..2d86056158d 100644 --- a/devel/mercurial/distinfo +++ b/devel/mercurial/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.20 2009/03/11 16:00:46 drochner Exp $ +$NetBSD: distinfo,v 1.21 2009/03/22 09:40:01 wiz Exp $ -SHA1 (mercurial-1.2.tar.gz) = c6590f6b833cfed22c04aae34b7060fd3372e86e -RMD160 (mercurial-1.2.tar.gz) = 8625517941f64a636f0b8503891463fe16eda8ef -Size (mercurial-1.2.tar.gz) = 1266559 bytes -SHA1 (patch-aa) = d8e9fad73053e53f5723e749e61a5cac8f7a9451 +SHA1 (mercurial-1.2.1.tar.gz) = f40282bbb17fedb08b16aa7a4eeb1da7b6a6f1cb +RMD160 (mercurial-1.2.1.tar.gz) = 37c94e5ef9cdc639fe23622ddaf97b2230ec2216 +Size (mercurial-1.2.1.tar.gz) = 1269393 bytes diff --git a/devel/mercurial/patches/patch-aa b/devel/mercurial/patches/patch-aa deleted file mode 100644 index 5625633cce2..00000000000 --- a/devel/mercurial/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2009/03/11 16:00:46 drochner Exp $ - ---- setup.py.orig 2009-03-08 15:51:11.000000000 +0100 -+++ setup.py -@@ -117,10 +117,10 @@ except OSError, e: - print "warning: could not establish Mercurial version: %s" % e - version = "unknown" - --f = file("mercurial/__version__.py", "w") --f.write('# this file is autogenerated by setup.py\n') --f.write('version = "%s"\n' % version) --f.close() -+#f = file("mercurial/__version__.py", "w") -+#f.write('# this file is autogenerated by setup.py\n') -+#f.write('version = "%s"\n' % version) -+#f.close() - - class install_package_data(install_data): - def finalize_options(self): |