lp:~noskcaj/ubuntu/trusty/enblend-enfuse/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/trusty/enblend-enfuse/merge
Branch merges
- Dmitry Shachnev: Approve
- Daniel Holbach (community): Needs Fixing
-
Diff: 249997 lines (+83674/-147540)353 files modified.pc/0001-Change-all-texinfo-variable-names-to-alpha-nums.patch/doc/enblend.texi (+2745/-0)
.pc/0001-Change-all-texinfo-variable-names-to-alpha-nums.patch/doc/enfuse.texi (+5900/-0)
.pc/0001-Change-all-texinfo-variable-names-to-alpha-nums.patch/doc/varsenblend.texi (+132/-0)
.pc/0001-Change-all-texinfo-variable-names-to-alpha-nums.patch/doc/varsenfuse.texi (+162/-0)
.pc/0002-expand-homepage-macro.patch/doc/bug-reports.texi (+178/-0)
.pc/0003-Texinfo-5.1-workaround-disable-some-macros.patch/doc/auxmac.texi (+261/-0)
.pc/0004-Texinfo-5.1-workaround-macro-on-a-separate-line.patch/doc/bug-reports.texi (+178/-0)
.pc/0004-Texinfo-5.1-workaround-macro-on-a-separate-line.patch/doc/enblend.texi (+2745/-0)
.pc/0004-Texinfo-5.1-workaround-macro-on-a-separate-line.patch/doc/enfuse.texi (+5900/-0)
.pc/0005-Texinfo-5.1-workaround-macro-on-a-separate-line.patch/doc/enblend.texi (+2759/-0)
.pc/0005-Texinfo-5.1-workaround-macro-on-a-separate-line.patch/doc/enfuse.texi (+5924/-0)
.pc/0006-Texinfo-5.1-workaround-macro-on-a-separate-line.patch/doc/enfuse.texi (+5933/-0)
.pc/0007-Leave-TEXINPUTS-alone.patch/doc/Makefile.in (+1175/-0)
.pc/0008-Texinfo-5.1-workaround-macro-on-a-separate-line.patch/doc/enblend.texi (+2768/-0)
.pc/0008-Texinfo-5.1-workaround-macro-on-a-separate-line.patch/doc/enfuse.texi (+5941/-0)
.pc/0009-Texinfo-5.1-workaround-equationW.patch/doc/enfuse.texi (+5943/-0)
.pc/10_ftbfs-gold.diff/configure (+0/-11396)
.pc/11_ftbfs_boost1.46.1.diff/src/filenameparse.cc (+0/-368)
.pc/15_texi_ids.diff/doc/enblend.texi (+0/-1604)
.pc/15_texi_ids.diff/doc/enfuse.texi (+0/-4375)
.pc/15_texi_ids.diff/doc/varsenblend.texi (+0/-120)
.pc/15_texi_ids.diff/doc/varsenfuse.texi (+0/-144)
.pc/16_hardcodeurl.diff/doc/bug-reports.texi (+0/-179)
.pc/17_fixinclude.diff/doc/enblend.texi (+0/-1604)
.pc/17_fixinclude.diff/doc/enfuse.texi (+0/-4375)
.pc/18_disablemacros.diff/doc/auxmac.texi (+0/-144)
.pc/19_classictimes.diff/doc/bug-reports.texi (+0/-179)
.pc/19_classictimes.diff/doc/enblend.texi (+0/-1604)
.pc/19_classictimes.diff/doc/enfuse.texi (+0/-4375)
.pc/20_semilog.diff/doc/enblend.texi (+0/-1611)
.pc/20_semilog.diff/doc/enfuse.texi (+0/-4395)
.pc/21_inline_foo.diff/doc/enfuse.texi (+0/-4404)
.pc/22_fixpdfbuild.diff/doc/Makefile.in (+0/-944)
.pc/23_perl5.18.diff/src/DefaultSig.pm (+0/-177)
.pc/applied-patches (+0/-11)
AUTHORS (+5/-0)
CMakeLists.txt (+438/-0)
CMakeModules/FindExiv2.cmake (+105/-0)
CMakeModules/FindGLEW.cmake (+26/-0)
CMakeModules/FindGLUT.cmake (+92/-0)
CMakeModules/FindGSL.cmake (+149/-0)
CMakeModules/FindJPEG.cmake (+41/-0)
CMakeModules/FindLCMS2.cmake (+35/-0)
CMakeModules/FindLibXMI.cmake (+30/-0)
CMakeModules/FindLibraryForCPU.cmake (+44/-0)
CMakeModules/FindLibraryWithDebug.cmake (+89/-0)
CMakeModules/FindOpenEXR.cmake (+164/-0)
CMakeModules/FindOpenGL.cmake (+136/-0)
CMakeModules/FindOpenMP.cmake (+113/-0)
CMakeModules/FindPANO13.cmake (+48/-0)
CMakeModules/FindPNG.cmake (+43/-0)
CMakeModules/FindPackageHandleStandardArgs.cmake (+58/-0)
CMakeModules/FindPkgConfig.cmake (+360/-0)
CMakeModules/FindTIFF.cmake (+44/-0)
CMakeModules/FindVIGRA.cmake (+88/-0)
CMakeModules/FindZLIB.cmake (+45/-0)
CMakeModules/HuginMacros.cmake (+38/-0)
COPYING (+20/-21)
ConfigureChecks.cmake (+135/-0)
INSTALL (+10/-5)
Makefile.am (+7/-1)
Makefile.in (+248/-158)
NEWS (+198/-0)
README (+135/-64)
README.txt (+135/-64)
VERSION (+1/-1)
VIGRA_LICENSE (+0/-25)
aclocal.m4 (+483/-283)
compile (+347/-0)
config.guess (+234/-178)
config.h.cmake (+213/-0)
config.h.in (+17/-8)
config.sub (+189/-112)
configure (+1515/-875)
configure.in (+166/-132)
debian/changelog (+64/-0)
debian/compat (+1/-1)
debian/control (+7/-6)
debian/copyright (+58/-121)
debian/patches-repack/00-win32helpers.patch (+10/-10)
debian/patches/0001-Change-all-texinfo-variable-names-to-alpha-nums.patch (+1025/-0)
debian/patches/0002-expand-homepage-macro.patch (+28/-0)
debian/patches/0003-Texinfo-5.1-workaround-disable-some-macros.patch (+88/-0)
debian/patches/0004-Texinfo-5.1-workaround-macro-on-a-separate-line.patch (+232/-0)
debian/patches/0005-Texinfo-5.1-workaround-macro-on-a-separate-line.patch (+133/-0)
debian/patches/0006-Texinfo-5.1-workaround-macro-on-a-separate-line.patch (+64/-0)
debian/patches/0007-Leave-TEXINPUTS-alone.patch (+39/-0)
debian/patches/0008-Texinfo-5.1-workaround-macro-on-a-separate-line.patch (+47/-0)
debian/patches/0009-Texinfo-5.1-workaround-equationW.patch (+84/-0)
debian/patches/10_ftbfs-gold.diff (+0/-30)
debian/patches/11_ftbfs_boost1.46.1.diff (+0/-42)
debian/patches/15_texi_ids.diff (+0/-1104)
debian/patches/16_hardcodeurl.diff (+0/-17)
debian/patches/17_fixinclude.diff (+0/-36)
debian/patches/18_disablemacros.diff (+0/-65)
debian/patches/19_classictimes.diff (+0/-168)
debian/patches/20_semilog.diff (+0/-118)
debian/patches/21_inline_foo.diff (+0/-53)
debian/patches/22_fixpdfbuild.diff (+0/-28)
debian/patches/23_perl5.18.diff (+0/-18)
debian/patches/series (+9/-11)
debian/rules (+16/-19)
depcomp (+347/-186)
doc/CMakeLists.txt (+342/-0)
doc/CreateVersTexi.pl (+47/-0)
doc/Makefile.am (+229/-102)
doc/Makefile.in (+408/-177)
doc/ReplaceValues.pl (+49/-0)
doc/auxmac.texi (+117/-0)
doc/bug-reports.texi (+17/-18)
doc/color-profiles.texi (+83/-0)
doc/config.gp (+16/-5)
doc/default.css (+13/-2)
doc/define2set.pl (+12/-0)
doc/enblend.info (+1177/-454)
doc/enblend.texi (+1374/-224)
doc/enfuse.info (+2310/-955)
doc/enfuse.texi (+2032/-491)
doc/entropy-cutoff.gp.in (+26/-8)
doc/entropy.gp.in (+18/-7)
doc/exposure-cutoff.gp.in (+59/-0)
doc/external-mask-workflow.fig (+79/-0)
doc/external-masks.texi (+47/-0)
doc/fig2txt.pl (+15/-0)
doc/filespec.texi (+19/-0)
doc/focus-stack-decision-tree.fig (+2/-8)
doc/gaussian.gp.in (+16/-5)
doc/laplacian-of-gaussian.gp.in (+18/-8)
doc/local-analysis-window.fig (+104/-104)
doc/macros.cmake (+145/-0)
doc/makeinfo-4.13-docbook.sed (+68/-0)
doc/mask-template-characters.texi (+6/-3)
doc/photographic-workflow.fig (+6/-6)
doc/seam-generators.texi (+73/-0)
doc/sharp-edge.gp.in (+9/-5)
doc/smooth-edge.gp.in (+9/-5)
doc/stamp-1 (+4/-4)
doc/stamp-vti (+4/-4)
doc/tidy-post.sed (+0/-25)
doc/tidy.cfg (+0/-18)
doc/tuning-memory-usage.texi (+41/-0)
doc/varsenblend.texi (+53/-41)
doc/varsenfuse.texi (+65/-47)
doc/versenblend.texi (+4/-4)
doc/versenfuse.texi (+4/-4)
doc/workflow.texi (+7/-22)
include/CMakeLists.txt (+15/-0)
include/Makefile.am (+3/-1)
include/Makefile.in (+175/-121)
include/vigra/Makefile.am (+0/-86)
include/vigra/Makefile.in (+0/-454)
include/vigra/accessor.hxx (+0/-1035)
include/vigra/affinegeometry.hxx (+0/-196)
include/vigra/array_vector.hxx (+0/-534)
include/vigra/basicgeometry.hxx (+0/-707)
include/vigra/basicimage.hxx (+0/-1315)
include/vigra/basicimageview.hxx (+0/-566)
include/vigra/bordertreatment.hxx (+0/-87)
include/vigra/boundarytensor.hxx (+0/-759)
include/vigra/cachedfileimage.hxx (+0/-2290)
include/vigra/codec.hxx (+0/-270)
include/vigra/colorconversions.hxx (+0/-2967)
include/vigra/combineimages.hxx (+0/-661)
include/vigra/config.hxx (+0/-199)
include/vigra/contourcirculator.hxx (+0/-240)
include/vigra/convolution.hxx (+0/-1144)
include/vigra/copyimage.hxx (+0/-285)
include/vigra/cornerdetection.hxx (+0/-734)
include/vigra/diff2d.hxx (+0/-1408)
include/vigra/distancetransform.hxx (+0/-423)
include/vigra/edgedetection.hxx (+0/-2065)
include/vigra/eigensystem.hxx (+0/-1167)
include/vigra/error.hxx (+0/-314)
include/vigra/fftw.hxx (+0/-1210)
include/vigra/fftw3.hxx (+0/-1886)
include/vigra/fixedpoint.hxx (+0/-809)
include/vigra/flatmorphology.hxx (+0/-1178)
include/vigra/functorexpression.hxx (+0/-2005)
include/vigra/functortraits.hxx (+0/-233)
include/vigra/gaborfilter.hxx (+0/-430)
include/vigra/gaussians.hxx (+0/-235)
include/vigra/gradient_energy_tensor.hxx (+0/-191)
include/vigra/imagecontainer.hxx (+0/-446)
include/vigra/imageinfo.hxx (+0/-463)
include/vigra/imageiterator.hxx (+0/-1661)
include/vigra/imageiteratoradapter.hxx (+0/-676)
include/vigra/impex.hxx (+0/-963)
include/vigra/initimage.hxx (+0/-493)
include/vigra/inspectimage.hxx (+0/-1536)
include/vigra/interpolating_accessor.hxx (+0/-171)
include/vigra/iteratoradapter.hxx (+0/-303)
include/vigra/iteratortags.hxx (+0/-53)
include/vigra/iteratortraits.hxx (+0/-642)
include/vigra/labelimage.hxx (+0/-1015)
include/vigra/linear_algebra.hxx (+0/-45)
include/vigra/linear_solve.hxx (+0/-293)
include/vigra/localminmax.hxx (+0/-909)
include/vigra/mathutil.hxx (+0/-579)
include/vigra/matrix.hxx (+0/-1480)
include/vigra/memory.hxx (+0/-99)
include/vigra/metaprogramming.hxx (+0/-292)
include/vigra/multi_array.hxx (+0/-1547)
include/vigra/multi_convolution.hxx (+0/-678)
include/vigra/multi_impex.hxx (+0/-171)
include/vigra/multi_iterator.hxx (+0/-1904)
include/vigra/multi_pointoperators.hxx (+0/-1586)
include/vigra/navigator.hxx (+0/-239)
include/vigra/nonlineardiffusion.hxx (+0/-716)
include/vigra/numerictraits.hxx (+0/-2383)
include/vigra/orientedtensorfilters.hxx (+0/-576)
include/vigra/pixelneighborhood.hxx (+0/-1451)
include/vigra/polynomial.hxx (+0/-1114)
include/vigra/rational.hxx (+0/-1313)
include/vigra/recursiveconvolution.hxx (+0/-1499)
include/vigra/resampling_convolution.hxx (+0/-580)
include/vigra/resizeimage.hxx (+0/-1400)
include/vigra/rfftw.hxx (+0/-249)
include/vigra/rgbvalue.hxx (+0/-1429)
include/vigra/seededregiongrowing.hxx (+0/-583)
include/vigra/separableconvolution.hxx (+0/-1718)
include/vigra/sized_int.hxx (+0/-164)
include/vigra/splineimageview.hxx (+0/-1822)
include/vigra/splines.hxx (+0/-1033)
include/vigra/static_assert.hxx (+0/-134)
include/vigra/stdcachedfileimage.hxx (+0/-195)
include/vigra/stdconvolution.hxx (+0/-1645)
include/vigra/stdimage.hxx (+0/-334)
include/vigra/stdimagefunctions.hxx (+0/-95)
include/vigra/symmetry.hxx (+0/-264)
include/vigra/tensorutilities.hxx (+0/-472)
include/vigra/tiff.hxx (+0/-1812)
include/vigra/tinyvector.hxx (+0/-1333)
include/vigra/transformimage.hxx (+0/-1258)
include/vigra/tuple.hxx (+0/-182)
include/vigra/utilities.hxx (+0/-79)
include/vigra/watersheds.hxx (+0/-470)
include/vigra/windows.h (+0/-54)
include/vigra_ext/CMakeLists.txt (+31/-0)
include/vigra_ext/Correlation.h (+0/-862)
include/vigra_ext/FitPolynom.h (+0/-137)
include/vigra_ext/FunctorAccessor.h (+0/-622)
include/vigra_ext/ImageTransforms.h (+0/-742)
include/vigra_ext/Interpolators.h (+0/-887)
include/vigra_ext/Makefile.am (+9/-20)
include/vigra_ext/Makefile.in (+108/-44)
include/vigra_ext/MultiLayerImage.h (+0/-152)
include/vigra_ext/MultiThreadOperations.h (+0/-142)
include/vigra_ext/NearestFeatureTransform.h (+0/-551)
include/vigra_ext/Pyramid.h (+0/-72)
include/vigra_ext/ROI.h (+0/-236)
include/vigra_ext/ROIImage.h (+0/-461)
include/vigra_ext/RansacParameterEstimator.h (+0/-58)
include/vigra_ext/VigQuotientEstimator.h (+0/-443)
include/vigra_ext/VignettingCorrection.h (+0/-596)
include/vigra_ext/XMIWrapper.h (+0/-146)
include/vigra_ext/blend.h (+0/-243)
include/vigra_ext/cachedfileimage.hxx (+2291/-0)
include/vigra_ext/fillpolygon.hxx (+471/-0)
include/vigra_ext/functoraccessor.hxx (+621/-0)
include/vigra_ext/impexalpha.hxx (+618/-411)
include/vigra_ext/ransac.h (+0/-428)
include/vigra_ext/rect2d.hxx (+30/-0)
include/vigra_ext/stdcachedfileimage.hxx (+197/-0)
include/vigra_ext/tiffUtils.h (+0/-552)
include/vigra_ext/utils.h (+0/-255)
install-sh (+21/-14)
mdate-sh (+28/-9)
missing (+159/-320)
src/CMakeLists.txt (+84/-0)
src/Makefile.am (+17/-11)
src/Makefile.in (+366/-279)
src/anneal.h (+172/-156)
src/assemble.h (+117/-133)
src/blend.h (+39/-205)
src/bounds.h (+46/-61)
src/common.h (+440/-113)
src/enblend.1 (+53/-19)
src/enblend.cc (+1160/-663)
src/enblend.h (+193/-190)
src/enfuse.1 (+63/-26)
src/enfuse.cc (+1123/-710)
src/enfuse.h (+432/-303)
src/error_message.cc (+1/-1)
src/error_message.h (+1/-1)
src/filenameparse.cc (+1/-1)
src/filenameparse.h (+1/-1)
src/filespec.cc (+124/-62)
src/filespec.h (+30/-5)
src/fixmath.h (+804/-315)
src/global.h (+280/-11)
src/gpu.cc (+114/-52)
src/gpu.h (+6/-2)
src/graphcut.h (+1472/-0)
src/layer_selection/Makefile.am (+14/-0)
src/layer_selection/Makefile.in (+647/-0)
src/layer_selection/info.cc (+114/-0)
src/layer_selection/info.h (+103/-0)
src/layer_selection/layer_selection.cc (+111/-0)
src/layer_selection/layer_selection.h (+105/-0)
src/layer_selection/selector.cc (+167/-0)
src/layer_selection/selector.h (+127/-0)
src/mask.h (+521/-527)
src/maskcommon.h (+289/-0)
src/masktypedefs.h (+38/-0)
src/mga.h (+56/-49)
src/minimizer.h (+680/-0)
src/muopt.h (+63/-0)
src/nearest.h (+33/-35)
src/numerictraits.h (+37/-47)
src/openmp.h (+143/-177)
src/path.h (+28/-32)
src/postoptimizer.h (+457/-0)
src/pyramid.h (+141/-136)
src/self_test.cc (+1/-1)
src/self_test.h (+1/-1)
src/tiff_message.cc (+1/-1)
src/tiff_message.h (+1/-1)
src/vigra_impex/Makefile.am (+0/-20)
src/vigra_impex/Makefile.in (+0/-726)
src/vigra_impex/auto_file.hxx (+0/-85)
src/vigra_impex/bmp.cxx (+0/-1120)
src/vigra_impex/bmp.hxx (+0/-108)
src/vigra_impex/byteorder.cxx (+0/-88)
src/vigra_impex/byteorder.hxx (+0/-182)
src/vigra_impex/codecmanager.cxx (+0/-379)
src/vigra_impex/codecmanager.hxx (+0/-109)
src/vigra_impex/error.hxx (+0/-45)
src/vigra_impex/exr.cxx (+0/-443)
src/vigra_impex/exr.hxx (+0/-121)
src/vigra_impex/gif.cxx (+0/-1083)
src/vigra_impex/gif.hxx (+0/-109)
src/vigra_impex/hdr.cxx (+0/-393)
src/vigra_impex/hdr.hxx (+0/-118)
src/vigra_impex/iccjpeg.c (+0/-259)
src/vigra_impex/iccjpeg.h (+0/-82)
src/vigra_impex/imageinfo.cxx (+0/-601)
src/vigra_impex/jpeg.cxx (+0/-530)
src/vigra_impex/jpeg.hxx (+0/-114)
src/vigra_impex/png.cxx (+0/-777)
src/vigra_impex/png.hxx (+0/-133)
src/vigra_impex/pnm.cxx (+0/-835)
src/vigra_impex/pnm.hxx (+0/-111)
src/vigra_impex/rgbe.c (+0/-520)
src/vigra_impex/rgbe.h (+0/-78)
src/vigra_impex/sun.cxx (+0/-522)
src/vigra_impex/sun.hxx (+0/-109)
src/vigra_impex/tiff.cxx (+0/-1001)
src/vigra_impex/tiff.hxx (+0/-136)
src/vigra_impex/viff.cxx (+0/-1094)
src/vigra_impex/viff.hxx (+0/-109)
src/vigra_impex/void_vector.cxx (+0/-47)
src/vigra_impex/void_vector.hxx (+0/-267)
texinfo.tex (+1613/-825)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 16. By Jackson Doak
-
* Merge from Debian, remaining changes:
- Build-depend on libglew-dev rather than libglew1.5-dev | libglew1.4-dev
| libglew-dev.
- Use default inlining parameters for the build.
- Build using -O1 on arm - 13. By Dimitri John Ledkov
-
* Merge from Debian, remaining changes:
- Build-depend on libtiff-dev rather than libtiff4-dev.
- Build-depend on libglew-dev rather than libglew1.5-dev | libglew1.4-dev
| libglew-dev.
- Use default inlining parameters for the build.
- Build using -O1 on armel. - 11. By Colin Watson
-
* Build-depend on libtiff-dev rather than libtiff4-dev.
* Build-depend on libglew-dev rather than libglew1.5-dev | libglew1.4-dev
| libglew-dev. - 9. By Felix Geyer
-
* Merge from Debian unstable. Remaining changes:
- Use default inlining parameters for the build.
- Build using -O1 on armel. - 8. By Fabrice Coutadeur
-
* Merge from Debian unstable. Remaining changes:
- Use default inlining parameters for the build.
- Build using -O1 on armel.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/trusty/enblend-enfuse