bzr bd -S, get-orig-source, and quilt patches

Andrew Starr-Bochicchio a.starr.b at gmail.com
Wed Jan 23 00:26:32 UTC 2013


On Tue, Jan 22, 2013 at 5:55 PM, Barry Warsaw <barry at python.org> wrote:
> I'm working on a extending the existing python-whoosh packaging to include
> Python 3 support.  The current released upstream tarball isn't Python 3.3
> compatible, but its Mercurial repository is.  I've written a
> get-{packaged-}orig-source target in my d/rules that does the right thing and
> with some very inconvenient testing[1], am fairly certain my new rules work.
>
> Now I've pushed my branch to lp:~barry/ubuntu/raring/python-whoosh/py3 but
> `bzr bd -S` doesn't work, because I've modified d/patches/*.patch to fix a
> problem in the hg trunk, and this doesn't apply to the unpacked source tree in
> the raring branch.
>
> Maybe what I'm trying to do is too stupid to succeed, but I thought I'd at
> least ask to see if anybody has suggestions.  Is it possible to modify an
> existing source branch with a new tarball containing a quilt patch that
> doesn't apply to the source branch?

I don't think that's possible, but what you could (should?) do is use
`bzr merge-upstream` on the tarball of the upstream snapshot:

bzr merge-upstream ../python-whoosh_2.4.1+hg1423.orig.tar.gz
--version=2.4.1+hg1423

I needed to remove your changelog entry and then re-add it after the
merge or else `bzr bd` choaks with:

"Unable to find the tag for the previous upstream version, 2.4.1+hg1423"

I've push my branch to:

lp:~andrewsomething/ubuntu/raring/python-whoosh/py3-upstream-snapshot

This successfully builds with `bzr bd -S`

Hope that's helpful,

-- Andrew Starr-Bochicchio

   Ubuntu Developer <https://launchpad.net/~andrewsomething>
   Debian Developer <http://qa.debian.org/developer.php?login=asb>
   PGP/GPG Key ID: D53FDCB1



More information about the bazaar mailing list