Ubuntu
libvigraimpex package

Merge lp://staging/~xnox/ubuntu/quantal/libvigraimpex/boost1.49 into lp://staging/ubuntu/quantal/libvigraimpex

  1. Quantal (12.10)
  2. boost1.49
  3. Merge into quantal
Proposed by Dimitri John Ledkov
Status: Merged
Merge reported by: Micah Gersten
Merged at revision: not available
Proposed branch: lp://staging/~xnox/ubuntu/quantal/libvigraimpex/boost1.49
Merge into: lp://staging/ubuntu/quantal/libvigraimpex
Diff against target: 6794 lines (+2317/-4327)
15 files modified
.pc/applied-patches (+1/-1)
.pc/debian-changes-1.7.1+dfsg1-2ubuntu1/include/vigra/numpy_array.hxx (+0/-1922)
.pc/fix-ftbfs-gcc4.7.diff/include/vigra/box.hxx (+545/-0)
.pc/fix-ftbfs-gcc4.7.diff/include/vigra/random_forest/rf_ridge_split.hxx (+449/-0)
.pc/fix-ftbfs-gcc4.7.diff/include/vigra/random_forest/rf_split.hxx (+1199/-0)
.pc/sizeof_ldbl_not_sizeof_dbl.diff/include/vigra/numpy_array.hxx (+0/-1918)
debian/changelog (+30/-0)
debian/control (+1/-1)
debian/patches/debian-changes-1.7.1+dfsg1-2ubuntu1 (+17/-265)
debian/patches/fix-ftbfs-gcc4.7.diff (+66/-0)
debian/patches/series (+3/-1)
include/vigra/box.hxx (+2/-2)
include/vigra/random_forest/rf_ridge_split.hxx (+2/-2)
include/vigra/random_forest/rf_split.hxx (+2/-2)
vigranumpy/docsrc/conf.py.THIS (+0/-213)
To merge this branch: bzr merge lp://staging/~xnox/ubuntu/quantal/libvigraimpex/boost1.49
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Barry Warsaw Pending
Review via email: mp+110409@code.staging.launchpad.net

Description of the change

This merges libvigraimpex from debian.
Barry, can you please review this package as it has interesting history and you were the last one to merge it.

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

On Jun 14, 2012, at 08:30 PM, Dmitrijs Ledkovs wrote:

>Barry, can you please review this package as it has interesting history and
>you were the last one to merge it.

What a mess! Sigh. Just one thing stands out.

=== modified file 'include/vigra/box.hxx'
--- include/vigra/box.hxx 2011-02-20 23:21:40 +0000
+++ include/vigra/box.hxx 2012-06-14 20:29:21 +0000
> @@ -388,7 +388,7 @@
> if(r.isEmpty())
> return *this;
> if(isEmpty())
> - return operator=(r);
> + return this->operator=(r);
>
> for(unsigned int i = 0; i < DIMENSION; ++i)
> {
> @@ -421,7 +421,7 @@
> if(isEmpty())
> return *this;
> if(r.isEmpty())
> - return operator=(r);
> + return this->operator=(r);
>
> for(unsigned int i = 0; i < DIMENSION; ++i)
> {

=== modified file 'include/vigra/random_forest/rf_ridge_split.hxx'
[...]

Why are these being modified in the source tree? Is this just quilt/bzr
artifacts? Does it actually build with these changes? Are they in a quilt
patch?

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 14/06/12 21:49, Barry Warsaw wrote:
> On Jun 14, 2012, at 08:30 PM, Dmitrijs Ledkovs wrote:
>
>> Barry, can you please review this package as it has interesting history and
>> you were the last one to merge it.
>
> What a mess! Sigh. Just one thing stands out.
>
>
> === modified file 'include/vigra/box.hxx'
> === modified file 'include/vigra/random_forest/rf_ridge_split.hxx'
>
> Why are these being modified in the source tree? Is this just quilt/bzr
> artifacts? Does it actually build with these changes? Are they in a quilt
> patch?
>

That is the new fix-ftbfs-gcc4.7.patch from doko, introduced in debian.
That's the reason why I'm merging this =)

Because it's a new patch you get: .pc/ & in tree modifications & an
extra patch in debian/patches/.

=/

--
Regards,
Dmitrijs.

Revision history for this message
Barry Warsaw (barry) wrote :

On Jun 14, 2012, at 09:55 PM, Dmitrijs Ledkovs wrote:

>Because it's a new patch you get: .pc/ & in tree modifications & an
>extra patch in debian/patches/.

:(

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 14/06/12 22:02, Barry Warsaw wrote:
> On Jun 14, 2012, at 09:55 PM, Dmitrijs Ledkovs wrote:
>
>> Because it's a new patch you get: .pc/ & in tree modifications & an
>> extra patch in debian/patches/.
>
> :(
>

Will you sponsor this? =)

--
Regards,
Dmitrijs.

Revision history for this message
Barry Warsaw (barry) wrote :

On Jun 14, 2012, at 09:25 PM, Dmitrijs Ledkovs wrote:

>On 14/06/12 22:02, Barry Warsaw wrote:
>> On Jun 14, 2012, at 09:55 PM, Dmitrijs Ledkovs wrote:
>>
>>> Because it's a new patch you get: .pc/ & in tree modifications & an
>>> extra patch in debian/patches/.
>>
>> :(
>>
>
>Will you sponsor this? =)

Sure, if it builds locally for me. :)

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 14/06/12 23:05, Barry Warsaw wrote:
> On Jun 14, 2012, at 09:25 PM, Dmitrijs Ledkovs wrote:
>
>> On 14/06/12 22:02, Barry Warsaw wrote:
>>> On Jun 14, 2012, at 09:55 PM, Dmitrijs Ledkovs wrote:
>>>
>>>> Because it's a new patch you get: .pc/ & in tree modifications & an
>>>> extra patch in debian/patches/.
>>>
>>> :(
>>>
>>
>> Will you sponsor this? =)
>
> Sure, if it builds locally for me. :)
>

I take it, it's still building ;-)
--
Regards,
Dmitrijs.

Revision history for this message
Barry Warsaw (barry) wrote :

On Jun 14, 2012, at 11:08 PM, Dmitrijs Ledkovs wrote:

>I take it, it's still building ;-)

chugga chugga :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches