lp:~xnox/ubuntu/quantal/libvigraimpex/boost1.49
- Get this branch:
- bzr branch lp:~xnox/ubuntu/quantal/libvigraimpex/boost1.49
Branch merges
- Ubuntu branches: Pending requested
- Barry Warsaw: Pending requested
-
Diff: 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)
Related bugs
Bug #635891: libvigraimpex (main) build-depends on hfd5 (universe) | High | Fix Released |
Related blueprints
Branch information
- Owner:
- Dimitri John Ledkov
- Status:
- Development
Recent revisions
- 28. By Dimitri John Ledkov
-
* Merge with Debian testing. Remaining Ubuntu changes:
- Remove build dependency on libhdf5-serial-dev (universe). LP: #635891.
- debian/patches/ no-hdf5. diff: Comment out additional methods
requiring HDF5.
- debian/libvigraimpex3. symbols: Mark additional HDF5 related symbols
as optional since these won't appear in the library.
- Build using dh_python2
- debian/patches/ debian- changes- 1.7.1+dfsg1- 2ubuntu1: refactor
include/vigra/noise_ normalization. hxx
* Dropped changes:
- 1.7.1+dfsg1-2ubuntu1 upload introduced an auto-generated patch with
merge conflicts and changes to include/vigra/numpy_ array.hxx, which
got reverted in the 1.7.1+dfsg1-2ubuntu2 upload by ending
sizeof_ldbl_not_ sizeof_ dbl.diff to fix FTBFS. I have dropped merge
conflicts & changes to numpy_array.hxx in both patches. Remaining
change is documented above. - 25. By Daniel T Chen
-
Add sizeof_
ldbl_not_ sizeof_ dbl.diff (backport fix from upstream
refactored include/vigra/numpy_ array_traits. hxx). Fixes FTBFS on
armel. - 24. By Barry Warsaw
-
* Merge with Debian testing. Remaining Ubuntu changes:
- Remove build dependency on libhdf5-serial-dev (universe). LP: #635891.
- debian/patches/ no-hdf5. diff: Comment out additional methods
requiring HDF5.
- debian/libvigraimpex3. symbols: Mark additional HDF5 related symbols
as optional since these won't appear in the library. - 23. By Ralf Treinen <email address hidden>
-
* QA upload
* Patch libpng15: Fix FTBFS with libpng 1.5 (closes: #636003). Thanks to
Nobuhiro Iwamatsu and Joachim Schleicher for forwarding and testing
the patch.
* Replace build-dependency on libpng12-dev by libpng-dev | libpng12-dev
in order to ease the upcoming libpng transition.
* Fix FTBFS on sh4 architecture by using -mieee flag (closes: #633818).
Thanks to Nobuhiro Iwamatsu for the patch! - 22. By Jakub Wilk
-
* QA upload.
* Set maintainer to Debian QA Group.
* Demote Recommends of the documentation packages to Suggests.
* Drop fix-tinyvectortest.diff, no longer needed.
* Drop Vcs-* fields.
* Strip jQuery code from .orig.tar.gz, as we don't have source for it.
+ Update debian/get-orig- source. sh, debian/rules, debian/watch.
+ Update debian/copyright.
* Overhaul debian/rules. Stop using dh.
* Use dh_sphinxdoc:
+ Update debian/control to use ${sphinxdoc:Depends} instead of hardcoded
libjs-jquery.
+ Call it in debian/rules if it's installed. Otherwise, generate substvars
manually.
* Add missing build-dependency on python-support. - 20. By Jakub Wilk
-
To fix FTBFS on s390, rewrite a loop in TinyVectorTest:
:equalIter( ), so
that it doesn't trigger bug in GCC 4.6 (see Debian bug #627795).
[fix-tinyvectortest.diff] - 19. By Jakub Wilk
-
* To fix FTBFS on powerpc with GCC 4.6, use epsilon comparison in
ConvolutionTest::recursiveFi lterTestFromRep eatWithAvoid. Thanks to Stefano
Rivera for debugging and for the patch. [fix-convolutiontest.diff]
* Allow libvigraimpex-dev to be co-installable with over providers of
libhdf5-dev than libhdf5-serial-dev (closes: #627421). Thanks to Laurent
Bonnaud for the bug report.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/libvigraimpex