From nobody@FreeBSD.org  Mon Jun 27 17:19:30 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55FA1106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Jun 2011 17:19:30 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 46C3B8FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Jun 2011 17:19:30 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p5RHJTrX066606
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Jun 2011 17:19:29 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p5RHJTn7066605;
	Mon, 27 Jun 2011 17:19:29 GMT
	(envelope-from nobody)
Message-Id: <201106271719.p5RHJTn7066605@red.freebsd.org>
Date: Mon, 27 Jun 2011 17:19:29 GMT
From: C-S <c-s@c-s.li>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] devel/bzr-builder
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         158352
>Category:       ports
>Synopsis:       [UPDATE] devel/bzr-builder
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    cs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 27 17:20:10 UTC 2011
>Closed-Date:    Mon Nov 14 05:00:49 UTC 2011
>Last-Modified:  Mon Nov 14 05:00:49 UTC 2011
>Originator:     C-S
>Release:        
>Organization:
>Environment:
>Description:
Update to 0.7
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN bzr-builder.orig/Makefile bzr-builder/Makefile
--- bzr-builder.orig/Makefile	2011-06-27 19:11:23.384749705 +0200
+++ bzr-builder/Makefile	2011-06-27 19:11:31.677607836 +0200
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	bzr-builder
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	devel
-MASTER_SITES=	http://launchpadlibrarian.net/56937826/ \
+MASTER_SITES=	http://launchpadlibrarian.net/73509810/ \
 		http://www.c-s.li/ports/
 
 MAINTAINER=	c-s@c-s.li
diff -ruN bzr-builder.orig/distinfo bzr-builder/distinfo
--- bzr-builder.orig/distinfo	2011-06-27 19:11:23.384749705 +0200
+++ bzr-builder/distinfo	2011-06-27 19:11:31.677607836 +0200
@@ -1,3 +1,2 @@
-MD5 (bzr-builder-0.6.tar.gz) = dcaccb660c80969fdad0c1e8ed22a14d
-SHA256 (bzr-builder-0.6.tar.gz) = d39cf70037f115a34a7293cffb33d329552f6c3d2702835b9e081e31d0852ddd
-SIZE (bzr-builder-0.6.tar.gz) = 41068
+SHA256 (bzr-builder-0.7.tar.gz) = bd5a8de07a068b3af6236900b8959c834f2117a289b9abc9df07cc1961125698
+SIZE (bzr-builder-0.7.tar.gz) = 49096


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->glarkin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jun 27 17:20:20 UTC 2011 
Responsible-Changed-Why:  
glarkin@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158352 
State-Changed-From-To: open->feedback 
State-Changed-By: glarkin 
State-Changed-When: Tue Jul 5 15:55:28 EDT 2011 
State-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=158352 

From: Greg Larkin <glarkin@sourcehosting.net>
To: bug-followup@FreeBSD.org, c-s@c-s.li
Cc:  
Subject: Re: ports/158352: [UPDATE] devel/bzr-builder
Date: Tue, 05 Jul 2011 15:44:43 -0400

 This is a multi-part message in MIME format.
 --------------090606080304080200080602
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi Carlo,
 
 I have a problem when running the command "bzr help commands" after
 installing the updated port:
 
 # bzr help commands
 bzr: ERROR: No module named debian_bundle
 You may need to install this Python library separately.
 
 I checked Google to see if there's an easy fix, but I didn't turn
 anything up just yet.  Do you have any ideas?
 
 Regards,
 Greg
 
 
 	<http://www.linkedin.com/e/sig/146767/>
 
 
 --------------090606080304080200080602
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
 
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
   </head>
   <body text="#000000" bgcolor="#ffffff">
     Hi Carlo,<br>
     <br>
     I have a problem when running the command "bzr help commands" after
     installing the updated port:<br>
     <br>
     <tt># bzr help commands<br>
       bzr: ERROR: No module named debian_bundle<br>
       You may need to install this Python library separately.</tt><br>
     <br>
     I checked Google to see if there's an easy fix, but I didn't turn
     anything up just yet.&nbsp; Do you have any ideas?<br>
     <br>
     Regards,<br>
     Greg<br>
     <div class="moz-signature">
       <table width="600" border="0" cellpadding="0" cellspacing="0">
         <tbody>
           <tr>
             <td colspan="2" style="border-top: 1px solid rgb(204, 204,
               204); padding: 10px;"><br>
             </td>
           </tr>
           <tr style="font: 10px arial,sans-serif;">
             <td style="border-top: 1px solid rgb(204, 204, 204);
               padding-top: 2px;"><br>
             </td>
             <td style="border-top: 1px solid rgb(204, 204, 204);
               padding-top: 2px;" align="right"><a target="nw"
                 href="http://www.linkedin.com/e/sig/146767/"></a><br>
             </td>
           </tr>
         </tbody>
       </table>
     </div>
   </body>
 </html>
 
 --------------090606080304080200080602--

From: C-S <c-s@c-s.li>
To: bug-followup@FreeBSD.org, glarkin@FreeBSD.org
Cc:  
Subject: Re: ports/158352: [UPDATE] devel/bzr-builder
Date: Wed, 13 Jul 2011 23:13:50 +0200

 Everything works fine for me. Typing "bzr help builder" gives me the
 regular help manual for bzr builder.
 

From: c-s@c-s.li
To: <bug-followup@FreeBSD.org>, <glarkin@freebsd.org>
Cc:  
Subject: Re: ports/158352: [UPDATE] devel/bzr-builder
Date: Wed, 10 Aug 2011 23:40:51 +0200

 --=_4a9c990d5855f59e822d393627e58d8d
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain; charset=UTF-8;
  format=flowed
 
 Update to 0.7.1
 
 Regarding the bug you discovered: I rechecked and I do have it too. I 
 will file a bug report. Please keep this port on hold and do not commit.
 
 Thanks,
 Carlo
 --=_4a9c990d5855f59e822d393627e58d8d
 Content-Transfer-Encoding: base64
 Content-Type: text/plain;
  name=bzr-builder.txt
 Content-Disposition: attachment;
  filename=bzr-builder.txt
 
 ZGlmZiAtcnVOIGJ6ci1idWlsZGVyLm9yaWcvTWFrZWZpbGUgYnpyLWJ1aWxkZXIvTWFrZWZpbGUK
 LS0tIGJ6ci1idWlsZGVyLm9yaWcvTWFrZWZpbGUJMjAxMS0wOC0xMCAyMzoyNjo1Mi4wODkxNTIx
 MDkgKzAyMDAKKysrIGJ6ci1idWlsZGVyL01ha2VmaWxlCTIwMTEtMDgtMTAgMjM6MzQ6MDMuMDEz
 OTE0OTY4ICswMjAwCkBAIC02LDIzICs2LDI0IEBACiAjCiAKIFBPUlROQU1FPQlienItYnVpbGRl
 cgotUE9SVFZFUlNJT049CTAuNgorUE9SVFZFUlNJT049CTAuNy4xCiBDQVRFR09SSUVTPQlkZXZl
 bAotTUFTVEVSX1NJVEVTPQlodHRwOi8vbGF1bmNocGFkbGlicmFyaWFuLm5ldC81NjkzNzgyNi8g
 XAorTUFTVEVSX1NJVEVTPQlodHRwOi8vbGF1bmNocGFkbGlicmFyaWFuLm5ldC83NTY4OTY1Ny8g
 XAogCQlodHRwOi8vd3d3LmMtcy5saS9wb3J0cy8KIAogTUFJTlRBSU5FUj0JYy1zQGMtcy5saQog
 Q09NTUVOVD0JQSBienIgcGx1Z2luIHRvIGNvbnN0cnVjdCBhIGJ6ciBicmFuY2ggYmFzZWQgb24g
 YSAicmVjaXBlIgogCitMSUNFTlNFPQlHUEx2MworCiBCVUlMRF9ERVBFTkRTPQlienI6JHtQT1JU
 U0RJUn0vZGV2ZWwvYmF6YWFyLW5nCiBSVU5fREVQRU5EUz0JYnpyOiR7UE9SVFNESVJ9L2RldmVs
 L2JhemFhci1uZwogCi1MSUNFTlNFPQlHUEx2MwotCiBXUktTUkM9CQkke1dSS0RJUn0vJHtQT1JU
 TkFNRX0tJHtQT1JUVkVSU0lPTn0KIAogVVNFX1BZVEhPTj0JCXllcwogVVNFX1BZRElTVFVUSUxT
 PQl5ZXMKIFBZRElTVFVUSUxTX1BLR05BTUU9CWJ6cl9idWlsZGVyCitQWURJU1RVVElMU19QS0dW
 RVJTSU9OPQkwLjcKIAogLmluY2x1ZGUgPGJzZC5wb3J0Lm1rPgpkaWZmIC1ydU4gYnpyLWJ1aWxk
 ZXIub3JpZy9kaXN0aW5mbyBienItYnVpbGRlci9kaXN0aW5mbwotLS0gYnpyLWJ1aWxkZXIub3Jp
 Zy9kaXN0aW5mbwkyMDExLTA4LTEwIDIzOjI2OjUyLjA4OTE1MjEwOSArMDIwMAorKysgYnpyLWJ1
 aWxkZXIvZGlzdGluZm8JMjAxMS0wOC0xMCAyMzozNDowMy4wMTM5MTQ5NjggKzAyMDAKQEAgLTEs
 MiArMSwyIEBACi1TSEEyNTYgKGJ6ci1idWlsZGVyLTAuNi50YXIuZ3opID0gZDM5Y2Y3MDAzN2Yx
 MTVhMzRhNzI5M2NmZmIzM2QzMjk1NTJmNmMzZDI3MDI4MzViOWUwODFlMzFkMDg1MmRkZAotU0la
 RSAoYnpyLWJ1aWxkZXItMC42LnRhci5neikgPSA0MTA2OAorU0hBMjU2IChienItYnVpbGRlci0w
 LjcuMS50YXIuZ3opID0gMWEyZGIyNWMzZjlmOTM0ODRiN2YxN2RhOGJjODYwMjY1NTk3MDdiNTMy
 NmYzYWQ2N2U4NGY0OTU3NTkyNTFkOQorU0laRSAoYnpyLWJ1aWxkZXItMC43LjEudGFyLmd6KSA9
 IDQ5NTk5Cg==
 --=_4a9c990d5855f59e822d393627e58d8d--
 

From: Greg Larkin <glarkin@sourcehosting.net>
To: bug-followup@FreeBSD.org, c-s@c-s.li
Cc:  
Subject: Re: ports/158352: [UPDATE] devel/bzr-builder
Date: Tue, 23 Aug 2011 13:37:41 -0400

 This is a multi-part message in MIME format.
 --------------020100020102000100050501
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi Carlo,
 
 It looks like your update to bzr-git depends on the fix for
 bzr-builder.  I have discovered that bzr-builder is generating the error
 message about debian_bundle.  There are a lot of Debian-specific bits in
 the bzr-builder code.  bzr-git imports bzr-builder, which then throws
 the import exception.
 
 I "fixed" the problem by simply commenting out the import code in
 bzr-builder like so:
 
 --- cmds.py.orig        2011-08-23 13:35:18.000000000 -0400
 +++ cmds.py     2011-08-23 13:30:57.000000000 -0400
 @@ -29,12 +29,12 @@
  import subprocess
  import tempfile
 
 -try:
 -    from debian import changelog, deb822
 -except ImportError:
 -    # In older versions of python-debian the main package was named
 -    # debian_bundle
 -    from debian_bundle import changelog, deb822
 +# try:
 +#     from debian import changelog, deb822
 +# except ImportError:
 +#     # In older versions of python-debian the main package was named
 +#     # debian_bundle
 +#     from debian_bundle import changelog, deb822
 
  from bzrlib import (
          errors,
 --- recipe.py.orig      2011-08-23 13:35:26.000000000 -0400
 +++ recipe.py   2011-08-23 13:31:09.000000000 -0400
 @@ -39,10 +39,10 @@
      NoWhoami = object()
 
 
 -try:
 -    from debian import changelog
 -except ImportError:
 -    from debian_bundle import changelog
 +# try:
 +#     from debian import changelog
 +# except ImportError:
 +#     from debian_bundle import changelog
 
  try:
      MergeIntoMerger = merge.MergeIntoMerger
 
 Is that sufficient?  If so, I'll commit that change, close this PR and
 then commit the update to bzr-git.
 
 Thank you,
 Greg
 
 
 
 	<http://www.linkedin.com/e/sig/146767/>
 
 
 --------------020100020102000100050501
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
 
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
   </head>
   <body text="#000000" bgcolor="#ffffff">
     Hi Carlo,<br>
     <br>
     It looks like your update to bzr-git depends on the fix for
     bzr-builder.&nbsp; I have discovered that bzr-builder is generating the
     error message about debian_bundle.&nbsp; There are a lot of
     Debian-specific bits in the bzr-builder code.&nbsp; bzr-git imports
     bzr-builder, which then throws the import exception.<br>
     <br>
     I "fixed" the problem by simply commenting out the import code in
     bzr-builder like so:<br>
     <br>
     <tt>--- cmds.py.orig&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2011-08-23 13:35:18.000000000 -0400<br>
       +++ cmds.py&nbsp;&nbsp;&nbsp;&nbsp; 2011-08-23 13:30:57.000000000 -0400<br>
       @@ -29,12 +29,12 @@<br>
       &nbsp;import subprocess<br>
       &nbsp;import tempfile<br>
       <br>
       -try:<br>
       -&nbsp;&nbsp;&nbsp; from debian import changelog, deb822<br>
       -except ImportError:<br>
       -&nbsp;&nbsp;&nbsp; # In older versions of python-debian the main package was
       named<br>
       -&nbsp;&nbsp;&nbsp; # debian_bundle<br>
       -&nbsp;&nbsp;&nbsp; from debian_bundle import changelog, deb822<br>
       +# try:<br>
       +#&nbsp;&nbsp;&nbsp;&nbsp; from debian import changelog, deb822<br>
       +# except ImportError:<br>
       +#&nbsp;&nbsp;&nbsp;&nbsp; # In older versions of python-debian the main package was
       named<br>
       +#&nbsp;&nbsp;&nbsp;&nbsp; # debian_bundle<br>
       +#&nbsp;&nbsp;&nbsp;&nbsp; from debian_bundle import changelog, deb822<br>
       <br>
       &nbsp;from bzrlib import (<br>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; errors,<br>
       --- recipe.py.orig&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2011-08-23 13:35:26.000000000 -0400<br>
       +++ recipe.py&nbsp;&nbsp; 2011-08-23 13:31:09.000000000 -0400<br>
       @@ -39,10 +39,10 @@<br>
       &nbsp;&nbsp;&nbsp;&nbsp; NoWhoami = object()<br>
       <br>
       <br>
       -try:<br>
       -&nbsp;&nbsp;&nbsp; from debian import changelog<br>
       -except ImportError:<br>
       -&nbsp;&nbsp;&nbsp; from debian_bundle import changelog<br>
       +# try:<br>
       +#&nbsp;&nbsp;&nbsp;&nbsp; from debian import changelog<br>
       +# except ImportError:<br>
       +#&nbsp;&nbsp;&nbsp;&nbsp; from debian_bundle import changelog<br>
       <br>
       &nbsp;try:<br>
       &nbsp;&nbsp;&nbsp;&nbsp; MergeIntoMerger = merge.MergeIntoMerger</tt><br>
     <br>
     Is that sufficient?&nbsp; If so, I'll commit that change, close this PR
     and then commit the update to bzr-git.<br>
     <br>
     Thank you,<br>
     Greg<br>
     <br>
     <div class="moz-signature">
       <table width="600" border="0" cellpadding="0" cellspacing="0">
         <tbody>
           <tr>
             <td colspan="2" style="border-top: 1px solid rgb(204, 204,
               204); padding: 10px;"><br>
             </td>
           </tr>
           <tr style="font: 10px arial,sans-serif;">
             <td style="border-top: 1px solid rgb(204, 204, 204);
               padding-top: 2px;"><br>
             </td>
             <td style="border-top: 1px solid rgb(204, 204, 204);
               padding-top: 2px;" align="right"><a target="nw"
                 href="http://www.linkedin.com/e/sig/146767/"></a><br>
             </td>
           </tr>
         </tbody>
       </table>
     </div>
   </body>
 </html>
 
 --------------020100020102000100050501--
Responsible-Changed-From-To: glarkin->cs 
Responsible-Changed-By: glarkin 
Responsible-Changed-When: Tue Sep 13 10:56:04 EDT 2011 
Responsible-Changed-Why:  
Reassign to maintainer who is a new committer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158352 
State-Changed-From-To: feedback->closed 
State-Changed-By: cs 
State-Changed-When: Mon Nov 14 04:59:19 UTC 2011 
State-Changed-Why:  
Close this PR because it is obsolete with the update to 0.7.2 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158352 
>Unformatted:
