...
 
Commits (28)
hugin (2019.0.0~beta1+dfsg-1) experimental; urgency=low
* Replace 20_flann_find_pkg-config.patch with the version committed to
upstream HG (which adds a non-UNIX else).
20_1a94c3ea8898_Update_flann_search_module.diff
* Run "wrap-and-sort --max-line-length=72 --short-indent" and add back
autodeleted comments.
* Add more heuristics to watchfile, beta for 2019.0.0 is shipped as
2019.0.beta1.
* New upstream snapshot.
+ Drop 20_1a94c3ea8898_Update_flann_search_module.diff
30_typo_constrast.diff
+ Icons moved from /usr/share/pixmaps to /usr/share/icons, update .install
file.
+ Ship newly available appdata files in hugin-data.
* Use debhelper 11 compat level.
* [lintian] 30_typos_lintian.diff: Fix typos Unknow/Therefor/therefor.
* Add Suggests: dcraw | rawtherapee | darktable, needed for raw import.
-- Andreas Metzler <ametzler@debian.org> Sat, 26 Jan 2019 16:37:02 +0100
hugin (2018.0.0+dfsg-3) unstable; urgency=medium
* 20_flann_find_pkg-config.patch: Use pkg-config to find flann, linking
hugin against liblz4 which is needed now, since flann dropped the included
copy of liblz4. (Thanks, Jochen Sprickerhof)
* [lintian] Delete empty line at bottom of changelog.
* 30_typo_constrast.diff: Fix typo in manpage found by lintian.
-- Andreas Metzler <ametzler@debian.org> Tue, 16 Oct 2018 18:35:04 +0200
hugin (2018.0.0+dfsg-2) unstable; urgency=low
* Drop get-orig-source target and add Files-Excluded stanza to
debian/copyright, delegating the heavy lifting to uscan.
* Delete superfluous --parallel argument to dh.
* Fix a couple of syntax errors in debian/copyright.
* Point vcs* to salsa.
* Set Rules-Requires-Root: no.
* Point $HOME and $XDG_RUNTIME_DIR to temporary dir in autopkgtest.
Closes: #903268
* Fix space-in-std-shortname-in-dep5-copyright lintian warning.
-- Andreas Metzler <ametzler@debian.org> Sat, 11 Aug 2018 15:09:50 +0200
hugin (2018.0.0+dfsg-1) unstable; urgency=low
* New upstream version, identical to rc2.
......@@ -1104,4 +1149,3 @@ hugin (0.6.1-1) unstable; urgency=low
* Initial release (Closes: #251618)
-- Florent Bayle <fbayle@bigfoot.com> Thu, 27 Jul 2006 16:17:46 +0200
......@@ -5,29 +5,57 @@ Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.deb
Uploaders: Andreas Metzler <ametzler@debian.org>
# hugin can use Boost::Signal or in Boost >= 1.54 Boost::Signal2 which is
# shipped in libboost-dev.
Build-Depends: debhelper (>= 10), dh-python, cmake (>= 3.1),
libboost-graph-dev (>= 1.47), libboost-thread-dev (>= 1.47),
libboost-regex-dev (>= 1.47), libboost-filesystem-dev (>= 1.47),
libboost-iostreams-dev (>= 1.47), libboost-system-dev (>= 1.47),
Build-Depends:
cmake (>= 3.1),
debhelper-compat (= 11),
dh-python,
libboost-filesystem-dev (>= 1.47),
libboost-graph-dev (>= 1.47),
libboost-iostreams-dev (>= 1.47),
libboost-regex-dev (>= 1.47),
libboost-signals-dev (>= 1.47) | libboost-dev (>= 1.54),
libboost-system-dev (>= 1.47),
libboost-thread-dev (>= 1.47),
libexiv2-dev (>= 0.12),
libfftw3-dev,
libflann-dev,
libglew-dev,
libgtk2.0-dev,
libjpeg-dev,
liblcms2-dev,
zlib1g-dev, libexiv2-dev (>= 0.12), libjpeg-dev,
libopenexr-dev, libpano13-dev (>= 2.9.19~beta1), libpng-dev,
libtiff-dev, libgtk2.0-dev, libwxgtk3.0-dev, libglew-dev,
swig (>= 2.0), python-dev, libsqlite3-dev,
libflann-dev, libfftw3-dev,
libvigraimpex-dev (>=1.9)
libopenexr-dev,
libpano13-dev (>= 2.9.19~beta1),
libpng-dev,
libsqlite3-dev,
libtiff-dev,
libvigraimpex-dev (>=1.9),
libwxgtk3.0-dev,
python-dev,
swig (>= 2.0),
zlib1g-dev
Build-Conflicts: wx2.6-headers, wx2.8-headers
Standards-Version: 4.1.3
Standards-Version: 4.3.0
Rules-Requires-Root: no
Homepage: http://hugin.sourceforge.net/
Vcs-Git: https://anonscm.debian.org/git/pkg-phototools/hugin.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-phototools/hugin.git
Vcs-Git: https://salsa.debian.org/debian-phototools-team/hugin.git
Vcs-Browser: https://salsa.debian.org/debian-phototools-team/hugin
Package: hugin
Architecture: any
Depends: hugin-tools (= ${binary:Version}), enblend (>= 3.2), enfuse, libimage-exiftool-perl, make, ${shlibs:Depends}, ${misc:Depends}
Depends:
enblend (>= 3.2),
enfuse,
hugin-tools (= ${binary:Version}),
libimage-exiftool-perl,
make,
${misc:Depends},
${shlibs:Depends}
Breaks: hugin-bin (<< 0.7.0~svn)
Replaces: hugin-bin (<< 0.7.0~svn), hugin-data (<< 0.7.0~svn), hugin-tools (<< 0.7.0~svn)
Replaces:
hugin-bin (<< 0.7.0~svn),
hugin-data (<< 0.7.0~svn),
hugin-tools (<< 0.7.0~svn)
Suggests: dcraw | rawtherapee | darktable
Description: panorama photo stitcher - GUI tools
Hugin is a panorama photo stitching program. Essentially, Hugin is a
GUI frontend for Panorama Tools. Stitching is accomplished by using
......@@ -46,8 +74,11 @@ Description: panorama photo stitcher - GUI tools
Package: hugin-tools
Architecture: any
Depends: hugin-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends},
${python:Depends}
Depends:
hugin-data (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Breaks: hugin-bin (<< 0.7.0~svn), ${python:Breaks}
Replaces: hugin-bin (<< 0.7.0~svn)
Recommends: libpano13-bin
......@@ -87,7 +118,7 @@ Description: panorama photo stitcher - commandline tools
Package: hugin-data
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
Breaks: ${python:Breaks}
# imports of included plugins
Suggests: python-wxgtk3.0
......
This diff is collapsed.
usr/share/icons
usr/share/appdata
usr/share/hugin
usr/share/icons
usr/share/locale
usr/share/pixmaps
# Binaries
usr/bin/align_image_stack
usr/bin/autooptimiser
usr/bin/celeste_standalone
usr/bin/checkpto
usr/bin/cpclean
usr/bin/cpfind
......@@ -9,51 +10,49 @@ usr/bin/fulla
usr/bin/geocpset
usr/bin/hugin_executor
usr/bin/hugin_hdrmerge
usr/bin/hugin_lensdb
usr/bin/hugin_stacker
usr/bin/icpfind
usr/bin/nona
usr/bin/tca_correct
usr/bin/vig_optimize
usr/bin/celeste_standalone
usr/bin/hugin_lensdb
usr/bin/linefind
usr/bin/nona
usr/bin/pano_modify
usr/bin/pano_trafo
usr/bin/pto_gen
usr/bin/pto_lensstack
usr/bin/pto_mask
usr/bin/pto_merge
usr/bin/pto_move
usr/bin/pto_gen
usr/bin/pto_lensstack
usr/bin/pto_template
usr/bin/pto_var
usr/bin/pano_modify
usr/bin/pano_trafo
usr/bin/tca_correct
usr/bin/verdandi
usr/bin/vig_optimize
usr/lib
# Manpages
usr/share/man/man1/align_image_stack.1*
usr/share/man/man1/autooptimiser.1*
usr/share/man/man1/celeste_standalone.1*
usr/share/man/man1/checkpto.1*
usr/share/man/man1/cpclean.1*
usr/share/man/man1/cpfind.1*
usr/share/man/man1/deghosting_mask.1*
usr/share/man/man1/fulla.1*
usr/share/man/man1/geocpset.1*
usr/share/man/man1/hugin_executor.1*
usr/share/man/man1/hugin_hdrmerge.1*
usr/share/man/man1/autooptimiser.1*
usr/share/man/man1/align_image_stack.1*
usr/share/man/man1/deghosting_mask.1*
usr/share/man/man1/icpfind.1*
usr/share/man/man1/nona.1*
usr/share/man/man1/vig_optimize.1*
usr/share/man/man1/tca_correct.1*
usr/share/man/man1/celeste_standalone.1*
usr/share/man/man1/hugin_lensdb.1*
usr/share/man/man1/icpfind.1*
usr/share/man/man1/linefind.1*
usr/share/man/man1/nona.1*
usr/share/man/man1/pano_modify.1*
usr/share/man/man1/pano_trafo.1*
usr/share/man/man1/pto_gen.1*
usr/share/man/man1/pto_lensstack.1.gz
usr/share/man/man1/pto_mask.1*
usr/share/man/man1/pto_merge.1*
usr/share/man/man1/pto_move.1*
usr/share/man/man1/pto_gen.1*
usr/share/man/man1/pto_lensstack.1.gz
usr/share/man/man1/pto_template.1.gz
usr/share/man/man1/pto_var.1.gz
usr/share/man/man1/tca_correct.1*
usr/share/man/man1/verdandi.1.gz
usr/share/man/man1/vig_optimize.1*
# Binaries
usr/bin/PTBatcherGUI
usr/bin/calibrate_lens_gui
usr/bin/hugin
usr/bin/hugin_stitch_project
usr/bin/PTBatcherGUI
usr/share/applications
usr/share/man/man1/PTBatcherGUI.1*
usr/share/man/man1/calibrate_lens_gui.1*
usr/share/man/man1/hugin.1*
usr/share/man/man1/hugin_stitch_project.1*
usr/share/man/man1/PTBatcherGUI.1*
# Desktop
usr/share/applications
usr/share/mime/packages/hugin.xml
Description: Fix typos Unknow/Therefor/therefor
Found by lintian.
Author: Andreas Metzler <ametzler@debian.org>
Origin: vendor
Forwarded: https://groups.google.com/forum/#!topic/hugin-ptx/EvEIymWCFVo
Last-Update: 2019-01-26
--- hugin-2019.0.0~beta1+dfsg.orig/doc/cpfind.pod
+++ hugin-2019.0.0~beta1+dfsg/doc/cpfind.pod
@@ -29,7 +29,7 @@ was successful two keypoints in the two
=head2 Rectilinear and fisheye images
-Cpfind can find control points in rectilinear and fisheye images. To achieve good control points images with a high horizontal field of view (e.g. ultra wide rectilinear or fisheye) are therefor remapped into a conformal space (cpfind is using the stereographic projection) and the feature matching occurs in this space. Before writing the control points the coordinates are remapped back to the image space. This happens automatic depending on the information about the lens in the input project file. So check that your input project file contains reasonable information about the used lens.
+Cpfind can find control points in rectilinear and fisheye images. To achieve good control points images with a high horizontal field of view (e.g. ultra wide rectilinear or fisheye) are therefore remapped into a conformal space (cpfind is using the stereographic projection) and the feature matching occurs in this space. Before writing the control points the coordinates are remapped back to the image space. This happens automatic depending on the information about the lens in the input project file. So check that your input project file contains reasonable information about the used lens.
=head2 Using celeste
--- hugin-2019.0.0~beta1+dfsg.orig/src/hugin1/hugin/MainFrame.h
+++ hugin-2019.0.0~beta1+dfsg/src/hugin1/hugin/MainFrame.h
@@ -81,7 +81,7 @@ private:
* It contains the menu & statusbar and a big notebook with
* the different tabs. It also holds the Panorama model.
*
- * it therefor also hold operations that determine the lifecycle
+ * it therefore also hold operations that determine the lifecycle
* of the panorama object (new, open, save, quit).
*/
class MainFrame : public wxFrame, public HuginBase::PanoramaObserver, public AppBase::ProgressDisplay
--- hugin-2019.0.0~beta1+dfsg.orig/src/tools/pano_modify.cpp
+++ hugin-2019.0.0~beta1+dfsg/src/tools/pano_modify.cpp
@@ -787,7 +787,7 @@ int main(int argc, char* argv[])
std::cout << "Setting verdandi arguments to " << blenderArgs << std::endl;
break;
default:
- std::cout << "Unknow blender in pto file." << std::endl;
+ std::cout << "Unknown blender in pto file." << std::endl;
break;
};
pano.setOptions(opt);
--- hugin-2019.0.0~beta1+dfsg.orig/src/tools/pto_lensstack.cpp
+++ hugin-2019.0.0~beta1+dfsg/src/tools/pto_lensstack.cpp
@@ -305,7 +305,7 @@ int main(int argc, char* argv[])
else
{
std::cout << "Warning: Pto project contains only one lens." << std::endl
- << " Therefor the lens can not be changed. Use --new-lens instead." << std::endl;
+ << " Therefore the lens can not be changed. Use --new-lens instead." << std::endl;
};
};
30_typos_lintian.diff
43_fallbackhelp.patch
......@@ -37,26 +37,7 @@ override_dh_python2:
dh_python2 -a --no-guessing-versions
%:
dh $@ --with python2 --parallel
dh $@ --with python2
override_dh_missing:
dh_missing --list-missing
get-orig-source:
rm -rf $(CURDIR)/debian/get-orig-source
mkdir $(CURDIR)/debian/get-orig-source
uscan --force-download --rename --download-version ${UVERSION} \
--destdir $(CURDIR)/debian/get-orig-source
cd $(CURDIR)/debian/get-orig-source && \
if test -e hugin_${UVERSION}.orig.tar.gz ; then \
tar xzf hugin_${UVERSION}.orig.tar.gz ; else \
tar xjf hugin_${UVERSION}.orig.tar.bz2 ; fi && \
cd hugin-* && \
rm -rvf platforms/windows/ mac/* \
src/foreign/getopt/src/msvs/ platforms/mac/* \
platforms/CMakeLists.txt &&\
touch platforms/CMakeLists.txt && \
find -name '*.vcproj' -delete && \
cd .. && \
tar -cJf $(CURDIR)/../hugin_$(UVERSION)+dfsg.orig.tar.xz hugin-*
rm -rf $(CURDIR)/debian/get-orig-source
......@@ -3,6 +3,9 @@
set -e
WORKDIR=$(mktemp -d --suffix=.hugin)
mkdir "$WORKDIR/home" "$WORKDIR/xdg"
export HOME="$WORKDIR/home"
export XDG_RUNTIME_DIR="$WORKDIR/xdg"
#trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
cp debian/tests/data/* $WORKDIR
......
version=3
version=4
opts="uversionmangle=s/[_-]/\~/g,dversionmangle=s/\+dfsg//" \
http://sf.net/hugin/hugin-(.+)\.tar\.(?:bz2|gz)
# handle 2019.0.beta1.tar.bz2
# handle 2019.0_beta1.tar.bz2
# handle 2019.0-beta1.tar.bz2
opts="uversionmangle=s/([0-9])[._-]([a-z])/$1.0\~$2/g,dversionmangle=s/\+dfsg//,compression=xz,repacksuffix=+dfsg" \
http://sf.net/hugin/hugin-(.+)@ARCHIVE_EXT@