Commit 3a150372 authored by Andreas Metzler's avatar Andreas Metzler

wrap-and-sort

Run "wrap-and-sort --max-line-length=72 --short-indent" and add back
autodeleted comments.
parent bd0ec3b2
......@@ -3,6 +3,8 @@ hugin (2018.0.0+dfsg-4) UNRELEASED; urgency=medium
* Replace 20_flann_find_pkg-config.patch with the version commited 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.
-- Andreas Metzler <ametzler@debian.org> Sat, 03 Nov 2018 16:32:20 +0100
......
......@@ -5,18 +5,34 @@ 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 (>= 10),
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.2.0
Rules-Requires-Root: no
......@@ -26,9 +42,19 @@ 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)
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
......@@ -47,8 +73,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
......@@ -88,7 +117,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
......
......@@ -400,30 +400,30 @@ License: Zlib
| The Alphanum Algorithm is an improved sorting algorithm for strings
| containing numbers. Instead of sorting numbers in ASCII order like a
| standard sort, this algorithm sorts numbers in numeric order.
|
|
| The Alphanum Algorithm is discussed at http://www.DaveKoelle.com
|
|
| This implementation is Copyright (c) 2008 Dirk Jagdmann <doj@cubic.org>.
| It is a cleanroom implementation of the algorithm and not derived by
| other's works. In contrast to the versions written by Dave Koelle this
| source code is distributed with the libpng/zlib license.
|
|
| This software is provided 'as-is', without any express or implied
| warranty. In no event will the authors be held liable for any damages
| arising from the use of this software.
|
|
| Permission is granted to anyone to use this software for any purpose,
| including commercial applications, and to alter it and redistribute it
| freely, subject to the following restrictions:
|
|
| 1. The origin of this software must not be misrepresented; you
| must not claim that you wrote the original software. If you use
| this software in a product, an acknowledgment in the product
| documentation would be appreciated but is not required.
|
|
| 2. Altered source versions must be plainly marked as such, and
| must not be misrepresented as being the original software.
|
|
| 3. This notice may not be removed or altered from any source
| distribution. */
......@@ -555,17 +555,17 @@ Copyright: © 2004 Pablo dAngelo <pablo.dangelo@web.de>
© 2011-2013 Thomas Pryds <thomas@pryds.eu>
© 2011-2012 Gareth Jones <gareth.k.jones@gmail.com>
© 2012 Maider Likona Santamarina <pisoni@gisa-elkartea.org>
© 2008 homin,Lee <ff4500@gmail.com>
© 2008 homin,Lee <ff4500@gmail.com>
© 2010-2013 Luís Henrique Camargo Quiroz <luishcq@gmail.com>
© 2011 Mihai Varzaru
© 2009 Zoran Mesec <zoran.mesec@gmail.com>
© 2010 Ewing Kang <f039281310@yahoo.com.tw>
© 2014, 2015 Carles Ferrando Garcia <carles.ferrando@gmail.com>
©
©
©
©
©
©
©
©
©
©
License: GPL-2+
......
usr/share/icons
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment