diff -Nru enblend-enfuse-4.2/debian/changelog enblend-enfuse-4.2/debian/changelog --- enblend-enfuse-4.2/debian/changelog 2018-04-22 08:18:11.000000000 +0000 +++ enblend-enfuse-4.2/debian/changelog 2019-07-21 13:03:39.000000000 +0000 @@ -1,3 +1,13 @@ +enblend-enfuse (4.2-5) unstable; urgency=medium + + * Run "wrap-and-sort --max-line-length=72 --short-indent" and add back + autodeleted comments. + * Set Rules-Requires-Root: no. + * [lintian] Drop trailing empty line in changelog. + * Use dh 12 compat. + + -- Andreas Metzler Sun, 21 Jul 2019 15:03:39 +0200 + enblend-enfuse (4.2-4) unstable; urgency=low * Point vcs* to salsa. @@ -338,4 +348,3 @@ * Added gcc4.3-includes.dpatch to add missing includes required by gcc-4.3. -- Sebastian Harl Fri, 28 Dec 2007 02:46:07 +0100 - diff -Nru enblend-enfuse-4.2/debian/compat enblend-enfuse-4.2/debian/compat --- enblend-enfuse-4.2/debian/compat 2018-04-21 17:43:38.000000000 +0000 +++ enblend-enfuse-4.2/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru enblend-enfuse-4.2/debian/control enblend-enfuse-4.2/debian/control --- enblend-enfuse-4.2/debian/control 2018-04-22 08:11:24.000000000 +0000 +++ enblend-enfuse-4.2/debian/control 2019-07-21 13:00:12.000000000 +0000 @@ -2,30 +2,52 @@ Section: graphics Priority: optional Maintainer: Debian PhotoTools Maintainers -Uploaders: Sebastian Harl , Andreas Metzler -Build-Depends: debhelper (>= 10), - libtiff-dev, libboost-dev (>= 1.55), liblcms2-dev (>= 2.5), - zlib1g-dev, libjpeg-dev, libpng-dev, libopenexr-dev, pkg-config, help2man, - perl, gnuplot, - libvigraimpex-dev (>= 1.8.0+dfsg-2), libgsl-dev, - imagemagick, m4, hevea, graphviz, - texlive-latex-base, texlive-latex-extra, texlive-latex-recommended, - texlive-extra-utils, librsvg2-bin, texlive-font-utils, texlive-fonts-extra, - libreadonly-perl +Uploaders: + Sebastian Harl , + Andreas Metzler +Build-Depends: + debhelper-compat (= 12), + gnuplot, + graphviz, + help2man, + hevea, + imagemagick, + libboost-dev (>= 1.55), + libgsl-dev, + libjpeg-dev, + liblcms2-dev (>= 2.5), + libopenexr-dev, + libpng-dev, + libreadonly-perl, + librsvg2-bin, + libtiff-dev, + libvigraimpex-dev (>= 1.8.0+dfsg-2), + m4, + perl, + pkg-config, + texlive-extra-utils, + texlive-font-utils, + texlive-fonts-extra, + texlive-latex-base, + texlive-latex-extra, + texlive-latex-recommended, + zlib1g-dev # texlive-latex-base for pdflatex, # texlive-latex-extra for bold-extra, enumitem, hyphenat, shorttoc, suffix, # xstring # texlive-latex-recommended for footnote, index, listings, microtype, ragged2e # texlive-extra-utils for texloganalyser # texlive-font-utils for repstopdf -Standards-Version: 4.1.4 +# texlive-fonts-extra for cmbcsc10 - #884230 +Standards-Version: 4.4.0 +Rules-Requires-Root: no Homepage: http://enblend.sourceforge.net/ Vcs-Git: https://salsa.debian.org/debian-phototools-team/enblend-enfuse.git Vcs-Browser: https://salsa.debian.org/debian-phototools-team/enblend-enfuse Package: enblend Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: hugin Enhances: hugin Description: image blending tool @@ -51,7 +73,7 @@ Package: enfuse Architecture: any -Depends: ${shlibs:Depends},${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: hugin Enhances: hugin Description: image exposure blending tool @@ -69,4 +91,3 @@ Enfuse does not align images for you. Use a tool like Hugin or PanoTools to do this. The TIFFs produced by these programs are exactly what Enfuse is designed to work with. - diff -Nru enblend-enfuse-4.2/debian/copyright enblend-enfuse-4.2/debian/copyright --- enblend-enfuse-4.2/debian/copyright 2018-02-04 15:30:42.000000000 +0000 +++ enblend-enfuse-4.2/debian/copyright 2018-11-17 12:24:04.000000000 +0000 @@ -238,13 +238,12 @@ src/float_cast.h Copyright © Erik de Castro Lopo - Permission to use, copy, modify, distribute, and sell this file for any - purpose is hereby granted without fee, provided that the above copyright + Permission to use, copy, modify, distribute, and sell this file for any + purpose is hereby granted without fee, provided that the above copyright and this permission notice appear in all copies. No representations are - made about the suitability of this software for any purpose. It is + made about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. The Debian packaging is © 2007-2010 Sebastian Harl , © 2008-2016 Andreas Metzler and is licensed under the GPL, version 2 or later, see above. - diff -Nru enblend-enfuse-4.2/debian/enblend.install enblend-enfuse-4.2/debian/enblend.install --- enblend-enfuse-4.2/debian/enblend.install 2018-02-04 15:30:42.000000000 +0000 +++ enblend-enfuse-4.2/debian/enblend.install 2018-11-17 12:24:04.000000000 +0000 @@ -1,5 +1,4 @@ -../../build-def/doc/enblend.pdf usr/share/doc/enblend ../../build-def/doc/enblend*.html usr/share/doc/enblend/html +../../build-def/doc/enblend.pdf usr/share/doc/enblend usr/bin/enblend usr/share/man/man1/enblend.1 - diff -Nru enblend-enfuse-4.2/debian/enfuse.install enblend-enfuse-4.2/debian/enfuse.install --- enblend-enfuse-4.2/debian/enfuse.install 2018-02-04 15:30:42.000000000 +0000 +++ enblend-enfuse-4.2/debian/enfuse.install 2018-11-17 12:24:04.000000000 +0000 @@ -1,5 +1,5 @@ -../../build-def/doc/enfuse.pdf usr/share/doc/enfuse ../../build-def/doc/enfuse*.html usr/share/doc/enfuse/html +../../build-def/doc/enfuse.pdf usr/share/doc/enfuse usr/bin/enfuse -usr/share/man/man1/enfuse.1 usr/share/doc/enblend-enfuse/examples/enfuse/* usr/share/doc/enfuse/examples/ +usr/share/man/man1/enfuse.1 diff -Nru enblend-enfuse-4.2/debian/rules enblend-enfuse-4.2/debian/rules --- enblend-enfuse-4.2/debian/rules 2018-04-21 17:51:01.000000000 +0000 +++ enblend-enfuse-4.2/debian/rules 2019-07-21 12:52:30.000000000 +0000 @@ -16,14 +16,15 @@ export DEB_BUILD_MAINT_OPTIONS := hardening=+all CONFARGS := --with-openexr=yes +MYDHAUTOOPTS = --builddirectory=build-def override_dh_auto_configure: dh_auto_configure --verbose \ - --builddirectory=build-def -- $(CONFARGS) \ + $(MYDHAUTOOPTS) -- $(CONFARGS) \ --enable-openmp override_dh_auto_build: - dh_auto_build --verbose --parallel --builddirectory=build-def + dh_auto_build --verbose $(MYDHAUTOOPTS) cd build-def && $(MAKE) pdf sed -i -e "s/manual page for enblend.*/combine images using a multiresolution spline/" \ @@ -32,7 +33,7 @@ build-def/src/enfuse.1 override_dh_auto_install: - dh_auto_install --verbose --builddirectory=build-def + dh_auto_install --verbose $(MYDHAUTOOPTS) mkdir -p $(CURDIR)/debian/enblend/usr/share/doc/enblend/html \ $(CURDIR)/debian/enfuse/usr/share/doc/enfuse/html cd $(CURDIR)/build-def/doc && \ @@ -55,4 +56,4 @@ dh_installdocs -A -a NEWS AUTHORS %: - dh $@ --builddirectory=build-def + dh $@ $(MYDHAUTOOPTS)