Changes 2.5.1:

This is a bugfix release. Most of the bugs dealt https and colocated
branches glitches. Upgrading is recommended for all users of earlier 2.5
releases.

4 files changed, 27 insertions, 48 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 877695e7d61..2c3e6cfcb09 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.58 2012/10/04 07:05:54 wiz Exp $
-
-DISTNAME=		bzr-${VER}
-PKGREVISION=		1
-CATEGORIES=		devel scm
-MASTER_SITES=		http://launchpad.net/bzr/${VER:R}/${VER}/+download/
-VER=			2.5.0
-
-MAINTAINER=		ddeus.pkgsrc@mailnull.com
-HOMEPAGE=		http://bazaar-vcs.org/
-COMMENT=		Bazaar open source distributed version control system
-LICENSE=		gnu-gpl-v2
+# $NetBSD: Makefile,v 1.59 2012/10/06 11:06:44 adam Exp $
+
+DISTNAME=	bzr-2.5.1
+CATEGORIES=	devel scm
+MASTER_SITES=	https://launchpad.net/bzr/${PKGVERSION_NOREV:R}/${PKGVERSION_NOREV}/+download/
+FETCH_USING=	curl
+
+MAINTAINER=	ddeus.pkgsrc@mailnull.com
+HOMEPAGE=	http://bazaar-vcs.org/
+COMMENT=	Bazaar open source distributed version control system
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=		${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index 4d1861a2e03..b439475c4cc 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2012/03/16 20:53:45 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.36 2012/10/06 11:06:44 adam Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -214,21 +214,9 @@ ${PYSITELIB}/bzrlib/doc_generate/autodoc_man.pyo
 ${PYSITELIB}/bzrlib/doc_generate/autodoc_rstx.py
 ${PYSITELIB}/bzrlib/doc_generate/autodoc_rstx.pyc
 ${PYSITELIB}/bzrlib/doc_generate/autodoc_rstx.pyo
-${PYSITELIB}/bzrlib/doc_generate/builders/__init__.py
-${PYSITELIB}/bzrlib/doc_generate/builders/__init__.pyc
-${PYSITELIB}/bzrlib/doc_generate/builders/__init__.pyo
-${PYSITELIB}/bzrlib/doc_generate/builders/texinfo.py
-${PYSITELIB}/bzrlib/doc_generate/builders/texinfo.pyc
-${PYSITELIB}/bzrlib/doc_generate/builders/texinfo.pyo
 ${PYSITELIB}/bzrlib/doc_generate/conf.py
 ${PYSITELIB}/bzrlib/doc_generate/conf.pyc
 ${PYSITELIB}/bzrlib/doc_generate/conf.pyo
-${PYSITELIB}/bzrlib/doc_generate/writers/__init__.py
-${PYSITELIB}/bzrlib/doc_generate/writers/__init__.pyc
-${PYSITELIB}/bzrlib/doc_generate/writers/__init__.pyo
-${PYSITELIB}/bzrlib/doc_generate/writers/texinfo.py
-${PYSITELIB}/bzrlib/doc_generate/writers/texinfo.pyc
-${PYSITELIB}/bzrlib/doc_generate/writers/texinfo.pyo
 ${PYSITELIB}/bzrlib/email_message.py
 ${PYSITELIB}/bzrlib/email_message.pyc
 ${PYSITELIB}/bzrlib/email_message.pyo
@@ -1044,21 +1032,6 @@ ${PYSITELIB}/bzrlib/tests/commands/test_revert.pyo
 ${PYSITELIB}/bzrlib/tests/commands/test_update.py
 ${PYSITELIB}/bzrlib/tests/commands/test_update.pyc
 ${PYSITELIB}/bzrlib/tests/commands/test_update.pyo
-${PYSITELIB}/bzrlib/tests/doc_generate/__init__.py
-${PYSITELIB}/bzrlib/tests/doc_generate/__init__.pyc
-${PYSITELIB}/bzrlib/tests/doc_generate/__init__.pyo
-${PYSITELIB}/bzrlib/tests/doc_generate/builders/__init__.py
-${PYSITELIB}/bzrlib/tests/doc_generate/builders/__init__.pyc
-${PYSITELIB}/bzrlib/tests/doc_generate/builders/__init__.pyo
-${PYSITELIB}/bzrlib/tests/doc_generate/builders/test_texinfo.py
-${PYSITELIB}/bzrlib/tests/doc_generate/builders/test_texinfo.pyc
-${PYSITELIB}/bzrlib/tests/doc_generate/builders/test_texinfo.pyo
-${PYSITELIB}/bzrlib/tests/doc_generate/writers/__init__.py
-${PYSITELIB}/bzrlib/tests/doc_generate/writers/__init__.pyc
-${PYSITELIB}/bzrlib/tests/doc_generate/writers/__init__.pyo
-${PYSITELIB}/bzrlib/tests/doc_generate/writers/test_texinfo.py
-${PYSITELIB}/bzrlib/tests/doc_generate/writers/test_texinfo.pyc
-${PYSITELIB}/bzrlib/tests/doc_generate/writers/test_texinfo.pyo
 ${PYSITELIB}/bzrlib/tests/fake_command.py
 ${PYSITELIB}/bzrlib/tests/fake_command.pyc
 ${PYSITELIB}/bzrlib/tests/fake_command.pyo
@@ -2449,6 +2422,7 @@ share/locale/ar/LC_MESSAGES/bzr.mo
 share/locale/ast/LC_MESSAGES/bzr.mo
 share/locale/bs/LC_MESSAGES/bzr.mo
 share/locale/ca/LC_MESSAGES/bzr.mo
+share/locale/cs/LC_MESSAGES/bzr.mo
 share/locale/de/LC_MESSAGES/bzr.mo
 share/locale/en_AU/LC_MESSAGES/bzr.mo
 share/locale/en_GB/LC_MESSAGES/bzr.mo
@@ -2456,9 +2430,12 @@ share/locale/es/LC_MESSAGES/bzr.mo
 share/locale/fo/LC_MESSAGES/bzr.mo
 share/locale/fr/LC_MESSAGES/bzr.mo
 share/locale/gl/LC_MESSAGES/bzr.mo
+share/locale/he/LC_MESSAGES/bzr.mo
 share/locale/it/LC_MESSAGES/bzr.mo
 share/locale/ja/LC_MESSAGES/bzr.mo
 share/locale/ms/LC_MESSAGES/bzr.mo
+share/locale/my/LC_MESSAGES/bzr.mo
+share/locale/nb/LC_MESSAGES/bzr.mo
 share/locale/nl/LC_MESSAGES/bzr.mo
 share/locale/oc/LC_MESSAGES/bzr.mo
 share/locale/pl/LC_MESSAGES/bzr.mo
@@ -2466,5 +2443,7 @@ share/locale/pt_BR/LC_MESSAGES/bzr.mo
 share/locale/ro/LC_MESSAGES/bzr.mo
 share/locale/ru/LC_MESSAGES/bzr.mo
 share/locale/sco/LC_MESSAGES/bzr.mo
+share/locale/sv/LC_MESSAGES/bzr.mo
 share/locale/tr/LC_MESSAGES/bzr.mo
 share/locale/ug/LC_MESSAGES/bzr.mo
+share/locale/vi/LC_MESSAGES/bzr.mo
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index ec61f686709..99c571d8d46 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.39 2012/03/16 20:53:45 cheusov Exp $
+$NetBSD: distinfo,v 1.40 2012/10/06 11:06:44 adam Exp $
 
-SHA1 (bzr-2.5.0.tar.gz) = 2eaf6340ffa35db425832419bbd88bb470d22af3
-RMD160 (bzr-2.5.0.tar.gz) = 3581accba3317b6f8b4ae889b0599d9546bb6877
-Size (bzr-2.5.0.tar.gz) = 9910498 bytes
-SHA1 (patch-ab) = a36f29e7100e79ebb0a333871b2b2f681553937a
+SHA1 (bzr-2.5.1.tar.gz) = 7e2776e3aaf8fb48828026d3fc2a3047465eea5e
+RMD160 (bzr-2.5.1.tar.gz) = c577d1aff17782774f0335d317d776a03a464d26
+Size (bzr-2.5.1.tar.gz) = 10451513 bytes
+SHA1 (patch-ab) = eae7e2baa12239e9c05e2afe775f8334c734de75
diff --git a/devel/bzr/patches/patch-ab b/devel/bzr/patches/patch-ab
index 4b6b1d35ea4..5d6fcce3584 100644
--- a/devel/bzr/patches/patch-ab
+++ b/devel/bzr/patches/patch-ab
@@ -1,9 +1,10 @@
-$NetBSD: patch-ab,v 1.9 2012/03/16 20:53:46 cheusov Exp $
+$NetBSD: patch-ab,v 1.10 2012/10/06 11:06:44 adam Exp $
+
+Install into PKGMANDIR
 
-# Honor PKGMANDIR
 --- setup.py.orig	2012-02-24 11:42:19.000000000 +0100
 +++ setup.py	2012-03-13 09:25:47.000000000 +0100
-@@ -761,7 +761,7 @@
+@@ -762,7 +762,7 @@
      if not 'bdist_egg' in sys.argv:
          # generate and install bzr.1 only with plain install, not the
          # easy_install one