Bug 132675 - Update: devel/bazaar-ng to 1.13
Summary: Update: devel/bazaar-ng to 1.13
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-03-15 22:30 UTC by Joseph S. Atkinson
Modified: 2009-03-16 20:50 UTC (History)
1 user (show)

See Also:


Attachments
bazaar-ng_1.13.diff (206.43 KB, patch)
2009-03-15 22:30 UTC, Joseph S. Atkinson
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Joseph S. Atkinson 2009-03-15 22:30:01 UTC

Was researching bazaar and noticed the new release 1.13 came out yesterday (Mar 14 2009). Went ahead and bumped the port while I was looking at it.

cc: fullermd@over-yonder.net (maintainer)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2009-03-15 22:30:14 UTC
Maintainer of devel/bazaar-ng,

Please note that PR ports/132675 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/132675

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2009-03-15 22:30:18 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 fullermd 2009-03-16 04:02:01 UTC
On Sun, Mar 15, 2009 at 10:30:14PM +0000 I heard the voice of
Edwin Groothuis, and lo! it spake thus:
>
> Maintainer of devel/bazaar-ng,
> 
> Please note that PR ports/132675 has just been submitted.

Yeesh, you sleep a little late one day...    8-}

The patch in the pr de-sorts the plist (leading to a way larger diff
than necessary).  Also, some launchpad changes somewhere along the
line make it not work quite right.  Here's an updated patch that will
do the trick:


Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/devel/bazaar-ng/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile	14 Feb 2009 19:17:33 -0000	1.42
+++ Makefile	16 Mar 2009 03:44:12 -0000
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.12
+PORTVERSION=	1.13
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpad.net/bzr/1.12/${PORTVERSION}/+download/
+MASTER_SITES=	https://launchpadlibrarian.net/23889955/
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	fullermd@over-yonder.net
Index: distinfo
===================================================================
RCS file: /usr/cvs/ports/devel/bazaar-ng/distinfo,v
retrieving revision 1.35
diff -u -r1.35 distinfo
--- distinfo	14 Feb 2009 19:17:33 -0000	1.35
+++ distinfo	16 Mar 2009 03:45:30 -0000
@@ -1,3 +1,3 @@
-MD5 (bzr-1.12.tar.gz) = 331ceefccbe39ddff610a1a847bd611a
-SHA256 (bzr-1.12.tar.gz) = 45658319296425b55ad1bb881adc27a311a5d429b3352b8088b2bdb722afe7b8
-SIZE (bzr-1.12.tar.gz) = 4001912
+MD5 (bzr-1.13.tar.gz) = f22502f43b1761da8af9a50ab429bab3
+SHA256 (bzr-1.13.tar.gz) = bd013a4ef9b5ad6a8ef2b946e11f113520893906bbb6d1142e628037c6dfda45
+SIZE (bzr-1.13.tar.gz) = 3989083
Index: pkg-plist
===================================================================
RCS file: /usr/cvs/ports/devel/bazaar-ng/pkg-plist,v
retrieving revision 1.31
diff -u -r1.31 pkg-plist
--- pkg-plist	14 Feb 2009 19:17:33 -0000	1.31
+++ pkg-plist	16 Mar 2009 03:52:05 -0000
@@ -173,6 +173,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/chunk_writer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/chunk_writer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/chunk_writer.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/clean_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/clean_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/clean_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/cmd_version_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/cmd_version_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/cmd_version_info.pyo
@@ -605,6 +608,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_clean_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_clean_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_clean_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyo
@@ -632,6 +638,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_filesystem_cicp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_filesystem_cicp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_filesystem_cicp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_filtered_view_ops.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_filtered_view_ops.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_filtered_view_ops.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyo
@@ -794,6 +803,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_view.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_view.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_view.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyo
@@ -818,6 +830,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_clone.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_clone.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_clone.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.pyo
@@ -962,6 +977,12 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyo
@@ -1061,6 +1082,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_check.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_check.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_check.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_default_stacking.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_default_stacking.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_default_stacking.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyo
@@ -1121,6 +1145,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chunk_writer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chunk_writer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chunk_writer.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_clean_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_clean_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_clean_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commands.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commands.pyo
@@ -1139,6 +1166,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_counted_lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_counted_lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_counted_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_debug.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_debug.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_debug.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyo
@@ -1163,6 +1193,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_export.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_export.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_export.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_extract.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_extract.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_extract.pyo
@@ -1313,6 +1346,7 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff-4
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff-5
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff-6
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff-7
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/insert_top.patch
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/mod
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/mod-2
@@ -1320,12 +1354,14 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/mod-4
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/mod-5
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/mod-6
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/mod-7
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/orig
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/orig-2
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/orig-3
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/orig-4
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/orig-5
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/orig-6
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/orig-7
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/patchtext.patch
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyc
@@ -1396,6 +1432,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_request.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_request.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_request.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyo
@@ -1663,6 +1702,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_views.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_views.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_views.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.pyo
@@ -1855,6 +1897,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/views.py
+%%PYTHON_SITELIBDIR%%/bzrlib/views.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/views.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyo
@@ -1915,6 +1960,7 @@
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference






-- 
Matthew Fuller     (MF4839)   |  fullermd@over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.
Comment 4 Joseph S Atkinson 2009-03-16 05:19:39 UTC
Matthew D. Fuller wrote:
> Yeesh, you sleep a little late one day...    8-}
> 

I was a) bored, b) there. ;)

> The patch in the pr de-sorts the plist (leading to a way larger diff
> than necessary).
 >

Yeah, it added quite a few bits and pieces here and there, and removed a 
few more. I just installed to /tmp and then did `file bzrdata -type f > 
tmp-plist` then mechanically fixed it from there. This seemed both 
faster and less prone to errors. I realize now, I should have passed it 
through sort too... oops. Sorry.

 > Also, some launchpad changes somewhere along the
 > line make it not work quite right.  Here's an updated patch that will
 > do the trick:
 >

I don't understand what you mean here. I have no issues fetching:

mpehisto# make distclean fetch checksum
===>  Cleaning for bazaar-ng-1.13
===>  Deleting distfiles for bazaar-ng-1.13
=> bzr-1.13.tar.gz doesn't seem to exist in /usr/ports/distfiles/.
=> Attempting to fetch from https://launchpad.net/bzr/1.13/1.13/+download/.
bzr-1.13.tar.gz                               100% of 3895 kB  374 kBps 
00m00s
=> MD5 Checksum OK for bzr-1.13.tar.gz.
=> SHA256 Checksum OK for bzr-1.13.tar.gz.

Maybe both should be used so that it has two and quiets portlint?
Comment 5 fullermd 2009-03-16 05:29:37 UTC
On Mon, Mar 16, 2009 at 01:19:39AM -0400 I heard the voice of
Joseph S. Atkinson, and lo! it spake thus:
> 
>  > Also, some launchpad changes somewhere along the line make it not
>  > work quite right.
> 
> I don't understand what you mean here. I have no issues fetching:

Well, it's not actually LP changes; it's fetch changes.  On 7.x it
works, but on -CURRENT it doesn't.

The two locations are the same thing:

% fetch -Av https://launchpad.net/bzr/1.13/1.13/+download/bzr-1.13.tar.gz
[...]
requesting https://launchpad.net/bzr/1.13/1.13/+download/bzr-1.13.tar.gz
302 redirect to https://launchpadlibrarian.net/23889955/bzr-1.13.tar.gz


But on 7.x, fetch actually ignores -A (on https; see
<http://svn.freebsd.org/viewvc/base?view=revision&revision=185912>)
and goes ahead and follows the redirect.  On -CURRENT, it doesn't.
This probably should actually lead to a discussion of whether there
isn't a better way of accomplishing the goal than using -A for ports,
but that's another matter.


-- 
Matthew Fuller     (MF4839)   |  fullermd@over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.
Comment 6 Martin Wilke freebsd_committer freebsd_triage 2009-03-16 06:25:53 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 7 Martin Wilke freebsd_committer freebsd_triage 2009-03-16 20:46:20 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 8 dfilter service freebsd_committer freebsd_triage 2009-03-16 20:46:32 UTC
miwi        2009-03-16 20:46:15 UTC

  FreeBSD ports repository

  Modified files:
    devel/bazaar-ng      Makefile distinfo pkg-plist 
  Log:
  - Update to 1.13
  
  PR:             132675
  Submitted by:   "Joseph S. Atkinson" <jsa@wickedmachine.net>
  Approved by:    maintainer
  
  Revision  Changes      Path
  1.43      +2 -2        ports/devel/bazaar-ng/Makefile
  1.36      +3 -3        ports/devel/bazaar-ng/distinfo
  1.32      +1731 -1690  ports/devel/bazaar-ng/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"