[Pkg-bazaar-maint] RFS: qbzr (0.21.2-1)

[Jelmer Vernooij]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12/15/2011 06:45 PM, Andrew Starr-Bochicchio wrote:
> On Thu, Dec 15, 2011 at 7:52 AM, Jelmer Vernooij <jelmer at samba.org> wrote:
>> Am 15/12/11 04:21, schrieb Andrew Starr-Bochicchio:
>>> Hi,
>>>
>>> I've updated qbzr in the pkg-bazaar branch to the latest upstream
>>> release (along with a cherrypicked commit for 2.5 compatibility).
>>> Here's the changelog:
>>>
>>> qbzr (0.21.2-1) unstable; urgency=low
>>>
>>> * New upstream release.
>>> * debian/control: Set DM-Upload-Allowed: yes
>>> * Cherrypick revision 1428 from trunk fixing compatibility
>>> bzr 2.5 series which has moved Feature from bzrlib.tests
>>> to bzrlib.tests.features.
>>>
>>> You can grab it from:
bzr+ssh://bzr.debian.org/bzr/bzr/pkg-bazaar/qbzr/unstable/
>>>
>>> I'd apprieciate a review/upload.
>>>
>> It's failing to build for me at the moment:
>>
>> make[1]: Leaving directory `/home/jelmer/src/qbzr/build-area/qbzr-0.21.2'
>> dh_clean -O--buildsystem=python_distutils
>> dpkg-source -b qbzr-0.21.2
>> dpkg-source: info: using options from
>> qbzr-0.21.2/debian/source/local-options: --unapply-patches
>> dpkg-source: info: using source format `3.0 (quilt)'
>> dpkg-source: info: building qbzr using existing ./qbzr_0.21.2.orig.tar.gz
>> dpkg-source: info: local changes detected, the modified files are:
>> qbzr-0.21.2/lib/tests/test_spellcheck.py
>> dpkg-source: error: aborting due to unexpected upstream changes, see
>> /tmp/qbzr_0.21.2-1.diff.CQyAtC
>> dpkg-source: info: you can integrate the local changes with dpkg-source
>> --commit
>> dpkg-buildpackage: error: dpkg-source -b qbzr-0.21.2 gave error exit
>> status 2
>>
>> It would be nice to have the cherrypicked change as a patch in
>> debian/patches. :-)
>
> Opps, forgot about that dpkg change. I built the source package on
> Ubuntu 11.10 before building/testing the binary in a sid chroot. Well
> that takes the fun out of having a packaging branch with a direct
> decadency from the upstream branch. :-)
There is still some use in it - "bzr dep3-patch" should be able to use
the ancestry to generate a dep3 patch with proper metadata for you.

E.g.

"bzr dep3-patch -c1428 lp:qbzr > debian/patches/01_bzr_2.5_compat"
> I pushed a change moving that to a proper patch.
Thanks, I'll have another look.

Cheers,

Jelmer

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJO6jNGAAoJEACAbyvXKaRXY6MP/2GqUyeNf4Wu7enAnCql/CwG
Fei/uOSB1pH8r0HwjFeNfYGwUgMYKxYF+lN1d+QcdLGg3dvDsRKX77PMXy/FDhQI
lyMujpJ5zYVkzSN3vGV/oBFqDdEPW/UphytHGjPj+8I5s1G5WQ8J8cyK+m9JsjRw
9hkU2KJQNn2yHZaCdv3twG+qTifqvtnsHYAb66cCtqckouXLb4cAyY5dkcW+4sWp
nVcX67vT/KNAyt66wQ7/Ym8GtuaF5DBY4iGUC97RJRJAs1DGRCvgA27aEVLYGh1K
ckHlFT+NELyP2svgF+OBwPYXgp3TAEfCGKbP5tuxdRJzbn9D4iiECUnskMwSeOiW
UNAJFnTxIn6LQGR3up2ccTyDyXnGoVQ35nf2j2PQMILzMIfL6tq3ysCk7VzckDpp
9WoF5Z94/SrpJcc20d2uuJglaELlJyrYskwoOcd7dXM50Llb5zfNS0uELip3QNYS
aKImmtgsngiQRFYEZBSBWcJOTNj7I1PQnxOPXOFC2L3mBme2Iu+y8wS3V/bqgmIM
gcoHc/qu6sO3uKuPMBx0l77yigWNIYZg3/Y7U6yfQNMqcnRKPKuKRheykqocmHDY
yGwQ/NakBeJFFPY4SWu3nCH4E9f6OeVEifFvqkCarbLTxVosMzwKvz7536AjOU8w
BmfMePss4XvICJdM8YF3
=xzkv
-----END PGP SIGNATURE-----