[pkgsrc/trunk]: pkgsrc/devel/mercurial Update to 1.2.1:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e7051806a761
branches:  trunk
changeset: 556471:e7051806a761
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Mar 22 09:40:01 2009 +0000

description:
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:

 devel/mercurial/Makefile         |   5 ++---
 devel/mercurial/distinfo         |   9 ++++-----
 devel/mercurial/patches/patch-aa |  19 -------------------
 3 files changed, 6 insertions(+), 27 deletions(-)

diffs (51 lines):

diff -r 76cda1e0bf1e -r e7051806a761 devel/mercurial/Makefile
--- a/devel/mercurial/Makefile  Sun Mar 22 09:37:13 2009 +0000
+++ b/devel/mercurial/Makefile  Sun Mar 22 09:40:01 2009 +0000
@@ -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 -r 76cda1e0bf1e -r e7051806a761 devel/mercurial/distinfo
--- a/devel/mercurial/distinfo  Sun Mar 22 09:37:13 2009 +0000
+++ b/devel/mercurial/distinfo  Sun Mar 22 09:40:01 2009 +0000
@@ -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 -r 76cda1e0bf1e -r e7051806a761 devel/mercurial/patches/patch-aa
--- a/devel/mercurial/patches/patch-aa  Sun Mar 22 09:37:13 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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):