[Merge] lp:~noskcaj/ubuntu/trusty/enblend-enfuse/merge into lp:ubuntu/enblend-enfuse

Jackson Doak Doak.jackson at gmail.com
Thu Jan 23 19:12:16 UTC 2014 

When that happens could you just manually upload it? bzr breaks a lot


On Fri, Jan 24, 2014 at 1:50 AM, Daniel Holbach
<daniel.holbach at ubuntu.com>wrote:

> Review: Needs Fixing
>
> daniel at daydream:~/enblend-enfuse$ bzr merge
> lp:~noskcaj/ubuntu/trusty/enblend-enfuse/merge
> Unapplying quilt patches to prevent spurious conflicts
> +N  CMakeLists.txt
> +N  CMakeModules/
> +N  CMakeModules/FindExiv2.cmake
> +N  CMakeModules/FindGLEW.cmake
> +N  CMakeModules/FindGLUT.cmake
> +N  CMakeModules/FindGSL.cmake
> +N  CMakeModules/FindJPEG.cmake
> +N  CMakeModules/FindLCMS2.cmake
> +N  CMakeModules/FindLibXMI.cmake
> +N  CMakeModules/FindLibraryForCPU.cmake
> +N  CMakeModules/FindLibraryWithDebug.cmake
> +N  CMakeModules/FindOpenEXR.cmake
> +N  CMakeModules/FindOpenGL.cmake
> +N  CMakeModules/FindOpenMP.cmake
> +N  CMakeModules/FindPANO13.cmake
> +N  CMakeModules/FindPNG.cmake
> +N  CMakeModules/FindPackageHandleStandardArgs.cmake
> +N  CMakeModules/FindPkgConfig.cmake
> +N  CMakeModules/FindTIFF.cmake
> +N  CMakeModules/FindVIGRA.cmake
> +N  CMakeModules/FindZLIB.cmake
> +N  CMakeModules/HuginMacros.cmake
> +N  ConfigureChecks.cmake
> +N  compile
> +N  config.h.cmake
> +N
>  debian/patches/0001-Change-all-texinfo-variable-names-to-alpha-nums.patch
> +N  debian/patches/0002-expand-homepage-macro.patch
> +N  debian/patches/0003-Texinfo-5.1-workaround-disable-some-macros.patch
> +N
>  debian/patches/0004-Texinfo-5.1-workaround-macro-on-a-separate-line.patch
> +N
>  debian/patches/0005-Texinfo-5.1-workaround-macro-on-a-separate-line.patch
> +N
>  debian/patches/0006-Texinfo-5.1-workaround-macro-on-a-separate-line.patch
> +N  debian/patches/0007-Leave-TEXINPUTS-alone.patch
> +N
>  debian/patches/0008-Texinfo-5.1-workaround-macro-on-a-separate-line.patch
> +N  debian/patches/0009-Texinfo-5.1-workaround-equationW.patch
> +N  doc/CMakeLists.txt
> +N  doc/CreateVersTexi.pl
> +N  doc/ReplaceValues.pl
> +N  doc/color-profiles.texi
> +N  doc/define2set.pl
> +N  doc/exposure-cutoff.gp.in
> +N  doc/external-mask-workflow.fig
> +N  doc/external-masks.texi
> +N  doc/fig2txt.pl
> +N  doc/macros.cmake
> +N  doc/makeinfo-4.13-docbook.sed
> +N  doc/seam-generators.texi
> +N  doc/seam-line-visualization.tif
> +N  include/CMakeLists.txt
> +N  include/vigra_ext/CMakeLists.txt
> +N  include/vigra_ext/cachedfileimage.hxx
> +N  include/vigra_ext/fillpolygon.hxx
> +N  include/vigra_ext/functoraccessor.hxx
> +N  include/vigra_ext/rect2d.hxx
> +N  include/vigra_ext/stdcachedfileimage.hxx
> +N  src/CMakeLists.txt
> +N  src/graphcut.h
> +N  src/layer_selection/
> +N  src/layer_selection/Makefile.am
> +N  src/layer_selection/Makefile.in
> +N  src/layer_selection/info.cc
> +N  src/layer_selection/info.h
> +N  src/layer_selection/layer_selection.cc
> +N  src/layer_selection/layer_selection.h
> +N  src/layer_selection/selector.cc
> +N  src/layer_selection/selector.h
> +N  src/maskcommon.h
> +N  src/masktypedefs.h
> +N  src/minimizer.h
> +N  src/muopt.h
> +N  src/postoptimizer.h
>  M  AUTHORS
>  M  COPYING
>  M  INSTALL
>  M  Makefile.am
>  M  Makefile.in
>  M  NEWS
>  M  README
>  M  README.txt
>  M  VERSION
> -D  VIGRA_LICENSE
>  M  aclocal.m4
>  M  config.guess
>  M  config.h.in
>  M  config.sub
>  M  configure
>  M  configure.in
>  M  debian/changelog
>  M  debian/compat
>  M  debian/control
>  M  debian/copyright
>  M  debian/patches-repack/00-win32helpers.patch
> -D  debian/patches/10_ftbfs-gold.diff
> -D  debian/patches/11_ftbfs_boost1.46.1.diff
> -D  debian/patches/15_texi_ids.diff
> -D  debian/patches/16_hardcodeurl.diff
> -D  debian/patches/17_fixinclude.diff
> -D  debian/patches/18_disablemacros.diff
> -D  debian/patches/19_classictimes.diff
> -D  debian/patches/20_semilog.diff
> -D  debian/patches/21_inline_foo.diff
> -D  debian/patches/22_fixpdfbuild.diff
> -D  debian/patches/23_perl5.18.diff
>  M  debian/patches/series
>  M  debian/rules
>  M  depcomp
>  M  doc/Makefile.am
>  M  doc/Makefile.in
>  M  doc/auxmac.texi
>  M  doc/bug-reports.texi
>  M  doc/config.gp
>  M  doc/default.css
>  M  doc/enblend.info
>  M  doc/enblend.texi
>  M  doc/enfuse.info
>  M  doc/enfuse.texi
>  M  doc/entropy-cutoff.gp.in
>  M  doc/entropy.gp.in
>  M  doc/filespec.texi
>  M  doc/focus-stack-decision-tree.fig
>  M  doc/gaussian.gp.in
>  M  doc/laplacian-of-gaussian.gp.in
>  M  doc/local-analysis-window.fig
>  M  doc/mask-template-characters.texi
>  M  doc/photographic-workflow.fig
>  M  doc/sharp-edge.gp.in
>  M  doc/smooth-edge.gp.in
>  M  doc/stamp-1
>  M  doc/stamp-vti
> -D  doc/tidy-post.sed
> -D  doc/tidy.cfg
>  M  doc/tuning-memory-usage.texi
>  M  doc/varsenblend.texi
>  M  doc/varsenfuse.texi
>  M  doc/versenblend.texi
>  M  doc/versenfuse.texi
>  M  doc/workflow.texi
>  M  include/Makefile.am
>  M  include/Makefile.in
> -D  include/vigra/
> -D  include/vigra/Makefile.am
> -D  include/vigra/Makefile.in
> -D  include/vigra/accessor.hxx
> -D  include/vigra/affinegeometry.hxx
> -D  include/vigra/array_vector.hxx
> -D  include/vigra/basicgeometry.hxx
> -D  include/vigra/basicimage.hxx
> -D  include/vigra/basicimageview.hxx
> -D  include/vigra/bordertreatment.hxx
> -D  include/vigra/boundarytensor.hxx
> -D  include/vigra/cachedfileimage.hxx
> -D  include/vigra/codec.hxx
> -D  include/vigra/colorconversions.hxx
> -D  include/vigra/combineimages.hxx
> -D  include/vigra/config.hxx
> -D  include/vigra/contourcirculator.hxx
> -D  include/vigra/convolution.hxx
> -D  include/vigra/copyimage.hxx
> -D  include/vigra/cornerdetection.hxx
> -D  include/vigra/diff2d.hxx
> -D  include/vigra/distancetransform.hxx
> -D  include/vigra/edgedetection.hxx
> -D  include/vigra/eigensystem.hxx
> -D  include/vigra/error.hxx
> -D  include/vigra/fftw.hxx
> -D  include/vigra/fftw3.hxx
> -D  include/vigra/fixedpoint.hxx
> -D  include/vigra/flatmorphology.hxx
> -D  include/vigra/functorexpression.hxx
> -D  include/vigra/functortraits.hxx
> -D  include/vigra/gaborfilter.hxx
> -D  include/vigra/gaussians.hxx
> -D  include/vigra/gradient_energy_tensor.hxx
> -D  include/vigra/imagecontainer.hxx
> -D  include/vigra/imageinfo.hxx
> -D  include/vigra/imageiterator.hxx
> -D  include/vigra/imageiteratoradapter.hxx
> -D  include/vigra/impex.hxx
> -D  include/vigra/initimage.hxx
> -D  include/vigra/inspectimage.hxx
> -D  include/vigra/interpolating_accessor.hxx
> -D  include/vigra/iteratoradapter.hxx
> -D  include/vigra/iteratortags.hxx
> -D  include/vigra/iteratortraits.hxx
> -D  include/vigra/labelimage.hxx
> -D  include/vigra/linear_algebra.hxx
> -D  include/vigra/linear_solve.hxx
> -D  include/vigra/localminmax.hxx
> -D  include/vigra/mathutil.hxx
> -D  include/vigra/matrix.hxx
> -D  include/vigra/memory.hxx
> -D  include/vigra/metaprogramming.hxx
> -D  include/vigra/multi_array.hxx
> -D  include/vigra/multi_convolution.hxx
> -D  include/vigra/multi_impex.hxx
> -D  include/vigra/multi_iterator.hxx
> -D  include/vigra/multi_pointoperators.hxx
> -D  include/vigra/navigator.hxx
> -D  include/vigra/nonlineardiffusion.hxx
> -D  include/vigra/numerictraits.hxx
> -D  include/vigra/orientedtensorfilters.hxx
> -D  include/vigra/pixelneighborhood.hxx
> -D  include/vigra/polynomial.hxx
> -D  include/vigra/rational.hxx
> -D  include/vigra/recursiveconvolution.hxx
> -D  include/vigra/resampling_convolution.hxx
> -D  include/vigra/resizeimage.hxx
> -D  include/vigra/rfftw.hxx
> -D  include/vigra/rgbvalue.hxx
> -D  include/vigra/seededregiongrowing.hxx
> -D  include/vigra/separableconvolution.hxx
> -D  include/vigra/sized_int.hxx
> -D  include/vigra/splineimageview.hxx
> -D  include/vigra/splines.hxx
> -D  include/vigra/static_assert.hxx
> -D  include/vigra/stdcachedfileimage.hxx
> -D  include/vigra/stdconvolution.hxx
> -D  include/vigra/stdimage.hxx
> -D  include/vigra/stdimagefunctions.hxx
> -D  include/vigra/symmetry.hxx
> -D  include/vigra/tensorutilities.hxx
> -D  include/vigra/tiff.hxx
> -D  include/vigra/tinyvector.hxx
> -D  include/vigra/transformimage.hxx
> -D  include/vigra/tuple.hxx
> -D  include/vigra/utilities.hxx
> -D  include/vigra/watersheds.hxx
> -D  include/vigra/windows.h
> -D  include/vigra_ext/Correlation.h
> -D  include/vigra_ext/FitPolynom.h
> -D  include/vigra_ext/FunctorAccessor.h
> -D  include/vigra_ext/ImageTransforms.h
> -D  include/vigra_ext/Interpolators.h
>  M  include/vigra_ext/Makefile.am
>  M  include/vigra_ext/Makefile.in
> -D  include/vigra_ext/MultiLayerImage.h
> -D  include/vigra_ext/MultiThreadOperations.h
> -D  include/vigra_ext/NearestFeatureTransform.h
> -D  include/vigra_ext/Pyramid.h
> -D  include/vigra_ext/ROI.h
> -D  include/vigra_ext/ROIImage.h
> -D  include/vigra_ext/RansacParameterEstimator.h
> -D  include/vigra_ext/VigQuotientEstimator.h
> -D  include/vigra_ext/VignettingCorrection.h
> -D  include/vigra_ext/XMIWrapper.h
> -D  include/vigra_ext/blend.h
>  M  include/vigra_ext/impexalpha.hxx
> -D  include/vigra_ext/ransac.h
> -D  include/vigra_ext/tiffUtils.h
> -D  include/vigra_ext/utils.h
>  M  install-sh
>  M  mdate-sh
>  M  missing
>  M  src/Makefile.am
>  M  src/Makefile.in
>  M  src/anneal.h
>  M  src/assemble.h
>  M  src/blend.h
>  M  src/bounds.h
>  M  src/common.h
>  M  src/enblend.1
>  M  src/enblend.cc
>  M  src/enblend.h
>  M  src/enfuse.1
>  M  src/enfuse.cc
>  M  src/enfuse.h
>  M  src/error_message.cc
>  M  src/error_message.h
>  M  src/filenameparse.cc
>  M  src/filenameparse.h
>  M  src/filespec.cc
>  M  src/filespec.h
>  M  src/fixmath.h
>  M  src/global.h
>  M  src/gpu.cc
>  M  src/gpu.h
>  M  src/mask.h
>  M  src/mga.h
>  M  src/nearest.h
>  M  src/numerictraits.h
>  M  src/openmp.h
>  M  src/path.h
>  M  src/pyramid.h
>  M  src/self_test.cc
>  M  src/self_test.h
>  M  src/tiff_message.cc
>  M  src/tiff_message.h
> -D  src/vigra_impex/
> -D  src/vigra_impex/Makefile.am
> -D  src/vigra_impex/Makefile.in
> -D  src/vigra_impex/auto_file.hxx
> -D  src/vigra_impex/bmp.cxx
> -D  src/vigra_impex/bmp.hxx
> -D  src/vigra_impex/byteorder.cxx
> -D  src/vigra_impex/byteorder.hxx
> -D  src/vigra_impex/codecmanager.cxx
> -D  src/vigra_impex/codecmanager.hxx
> -D  src/vigra_impex/error.hxx
> -D  src/vigra_impex/exr.cxx
> -D  src/vigra_impex/exr.hxx
> -D  src/vigra_impex/gif.cxx
> -D  src/vigra_impex/gif.hxx
> -D  src/vigra_impex/hdr.cxx
> -D  src/vigra_impex/hdr.hxx
> -D  src/vigra_impex/iccjpeg.c
> -D  src/vigra_impex/iccjpeg.h
> -D  src/vigra_impex/imageinfo.cxx
> -D  src/vigra_impex/jpeg.cxx
> -D  src/vigra_impex/jpeg.hxx
> -D  src/vigra_impex/png.cxx
> -D  src/vigra_impex/png.hxx
> -D  src/vigra_impex/pnm.cxx
> -D  src/vigra_impex/pnm.hxx
> -D  src/vigra_impex/rgbe.c
> -D  src/vigra_impex/rgbe.h
> -D  src/vigra_impex/sun.cxx
> -D  src/vigra_impex/sun.hxx
> -D  src/vigra_impex/tiff.cxx
> -D  src/vigra_impex/tiff.hxx
> -D  src/vigra_impex/viff.cxx
> -D  src/vigra_impex/viff.hxx
> -D  src/vigra_impex/void_vector.cxx
> -D  src/vigra_impex/void_vector.hxx
>  M  texinfo.tex
> Text conflict in doc/auxmac.texi
> Text conflict in doc/bug-reports.texi
> Text conflict in doc/enblend.texi
> Text conflict in doc/enfuse.texi
> Text conflict in doc/varsenblend.texi
> Text conflict in doc/varsenfuse.texi
>
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/trusty/enblend-enfuse/merge/+merge/202544
> You are the owner of lp:~noskcaj/ubuntu/trusty/enblend-enfuse/merge.
>

-- 
https://code.launchpad.net/~noskcaj/ubuntu/trusty/enblend-enfuse/merge/+merge/202544
Your team Ubuntu branches is subscribed to branch lp:ubuntu/enblend-enfuse.

More information about the Ubuntu-reviews mailing list