Hi,
I think this is likely to be
https://bugs.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/876888
Thanks,
James
On Thu, 27 Oct 2011 07:39:09 -0400, Barry Warsaw wrote:
> How exactly does --package-merge calculate the version it passes to
> dpkg-genchanges -v? I'm wondering because it doesn't seem to be doing what
> I'd expect it to do, and I'm reluctant to use it.
>
> Latest case in point: I'm merging boost1.46 from testing into precise, so I do
> the following:
>
> $ bzr branch ubuntu:boost1.46 precise
> $ cd precise
> $ bzr merge-package debianlp:boost1.46
> Most recent Debian version: MISSING
> Text conflict in debian/control
> 1 conflicts encountered.
> The merge resulted in 1 conflicts. Please resolve these and commit the
> changes with "bzr commit".
>
>
>
> $ bzr diff debian/changelog
> === modified file 'debian/changelog'
> --- debian/changelog 2011-06-03 20:28:58 +
> +++ debian/changelog 2011-10-27 01:57:00 +
> @@ -1,3 +1,35 @@
> +boost1.46 (1.46.1-7ubuntu1) precise; urgency=low
> +
> + * Merge with Debian testing. Remaining Ubuntu changes:
> +- Detect gcc atomic intrinsics, needed for arm spinlock (LP: #513721)
> +- Drop libboost-mpi, libboost-mpi-python, and libboost-graph-parallel
> (and
> + related -dev packages): we don't want to pull all of the mpi packages
> + into main. These are provided in a separate boost-mpi-source1.46
> + package
> +- Drop libboost1.46-all-dev and provide from boost-mpi-source1.46
> +- Adjust debian/rules and debian/control
> +
> + -- Barry Warsaw Wed, 26 Oct 2011 21:56:45 -0400
> +
> +boost1.46 (1.46.1-7) unstable; urgency=low
> +
> + * control: Fix ungrammatical description for iostreams packages.
> +Closes: #633865.
> +
> + * rules: Dump boostrap log file if bootstrapping fails.
> +
> + * libboost-doc.README.Debian: Remove reference to packages bjam and
> +boost-build; now only need boostX.YZ-dev. Closes: #630529.
> +
> + -- Steve M. Robbins Wed, 17 Aug 2011 23:18:52 -0500
> +
> +boost1.46 (1.46.1-6) unstable; urgency=low
> +
> + * control(libboost-mpi-python1.46.1, libboost-python1.46.1): Suggests a
> +python interpreter. Closes: #620775.
> +
> + -- Steve M. Robbins Sun, 12 Jun 2011 00:37:42 -0500
> +
> boost1.46 (1.46.1-5ubuntu2) oneiric; urgency=low
>
>* No change rebuild to drop Python 3.1 support.
>
>
>
> $ bzr bd -S --package-merge
>
> If I now look at boost1.46_1.46.1-7ubuntu1_source.changes I see *all* the
> version entries from 1.46.1-7ubuntu1 all the way back to 1.21.1-1, the first
> in the changelog.
>
> If I drop the --package-merge option, I get a much trimmer changes file, with
> just the last changelog entry in it. That's not right either though. I'd
> expect to see entries for -6, -7 and -7ubuntu1.
>
> I've pushed the branch to lp:~barry/ubuntu/precise/boost1.46/debian-merge in
> case you'd like to take a look at see what's going on. I'll hold off on
> uploading for a bit in case there's something obvious going on.
>
> Cheers,
> -Barry
Attachment: signature.asc (application/pgp-signature)
> --
> ubuntu-distributed-devel mailing list
> ubuntu-distributed-devel@lists.ubuntu.com
> Modify settings or unsubscribe at:
> https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
--
ubuntu-distributed-devel mailing list
ubuntu-distributed-devel@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
