[libvigraimpex] 02/06: Imported Debian patch 1.10.0+dfsg-8
Daniel Stender
danstender-guest at moszumanska.debian.org
Wed Apr 29 15:12:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
danstender-guest pushed a commit to branch master
in repository libvigraimpex.
commit 77d555e3c5f23067bd6cdac6d6ced3123da4403a
Merge: 75ca592 bc0329b
Author: Daniel Stender <debian at danielstender.com>
Date: Wed Feb 11 17:13:23 2015 +0100
Imported Debian patch 1.10.0+dfsg-8
.gitignore | 35 +
.travis.yml | 15 +
debian/changelog | 101 +-
debian/control | 128 +-
debian/copyright | 62 +-
debian/dh_numpy | 33 +
debian/get-orig-source.sh | 35 +
debian/libvigraimpex5.docs | 2 +-
...-noise-variance-clustering-vigranumpy-test.diff | 19 -
debian/patches/docsrc-out-of-source.diff | 4 +-
debian/patches/docsrc-paths.diff | 18 +-
debian/patches/off-by-on-in-exportImageAlpha.diff | 15 +
debian/patches/removed-static-docs.diff | 11 +-
debian/patches/series | 2 +-
debian/patches/vigra-config-docdir.diff | 4 +-
debian/rules | 42 +-
debian/watch | 5 +-
doc/vigra/LICENSE.txt | 25 +
doc/vigra/dissolved_color.gif | Bin 0 -> 26116 bytes
doc/vigra/documents/bullet.gif | Bin 0 -> 84 bytes
doc/vigra/documents/pfeil.gif | Bin 0 -> 82 bytes
doc/vigra/documents/pfeilGross.gif | Bin 0 -> 640 bytes
doc/vigra/documents/tutorial_reference.pdf | Bin 0 -> 107966 bytes
doc/vigra/documents/vigra.gif | Bin 0 -> 10251 bytes
doc/vigra/dynsections.js | 97 ++
doc/vigra/formula.repository | 139 ++
doc/vigra/jquery.js | 8 +
doc/vigra/lenna_color.gif | Bin 0 -> 197227 bytes
doc/vigra/lenna_color_small.gif | Bin 0 -> 26116 bytes
doc/vigra/lenna_composite_color.gif | Bin 0 -> 102075 bytes
doc/vigra/lenna_gray.gif | Bin 0 -> 234921 bytes
doc/vigra/lenna_inverted.gif | Bin 0 -> 26116 bytes
doc/vigra/lenna_mirror_horizontal.gif | Bin 0 -> 26116 bytes
doc/vigra/lenna_mirror_vertical.gif | Bin 0 -> 26116 bytes
doc/vigra/lenna_small.gif | Bin 0 -> 26116 bytes
doc/vigra/lenna_smoothed.gif | Bin 0 -> 26116 bytes
doc/vigra/lenna_stripes.gif | Bin 0 -> 26116 bytes
doc/vigra/lenna_sub.gif | Bin 0 -> 7253 bytes
doc/vigra/lenna_transposed_major.gif | Bin 0 -> 26116 bytes
doc/vigra/lenna_transposed_minor.gif | Bin 0 -> 26116 bytes
doc/vigra/oi_small.jpg | Bin 0 -> 8596 bytes
doc/vigra/tabs.css | 60 +
doc/vigra/testimage.gif | Bin 0 -> 29823 bytes
doc/vigra/testimage.jpg | Bin 0 -> 8522 bytes
.../docsrc/_static => doc/vigra}/vigra-icon.ico | Bin
doc/vigra/vigra.css | 457 ++++++
doc/vigra/vigra_1_8_2.css | 1622 ++++++++++++++++++++
docsrc/documents/bullet.gif | Bin 0 -> 84 bytes
docsrc/documents/pfeil.gif | Bin 0 -> 82 bytes
docsrc/documents/pfeilGross.gif | Bin 0 -> 640 bytes
docsrc/documents/vigra.gif | Bin 0 -> 10251 bytes
vigranumpy/docsrc/_static/basic.css | 413 -----
vigranumpy/docsrc/_static/default.css | 210 ---
vigranumpy/docsrc/_static/doctools.js | 232 ---
vigranumpy/docsrc/_static/file.png | Bin 392 -> 0 bytes
vigranumpy/docsrc/_static/jquery.js | 32 -
vigranumpy/docsrc/_static/minus.png | Bin 199 -> 0 bytes
vigranumpy/docsrc/_static/plus.png | Bin 199 -> 0 bytes
vigranumpy/docsrc/_static/pygments.css | 61 -
vigranumpy/docsrc/_static/searchtools.js | 467 ------
60 files changed, 2793 insertions(+), 1561 deletions(-)
diff --cc debian/changelog
index e8429fe,0000000..242f33f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,439 -1,0 +1,508 @@@
- libvigraimpex (1.10.0+dfsg-1) UNRELEASED; urgency=medium
-
- * New upstream version (verify and refresh patches)
- Soversion bumped from 4 to 5
- Closes: #702447
- * debian/watch: point to Github
- * debian/copyright: Files-Excluded, removed get-orig-source.sh
- * debian/control:
- - Build-Depends: libtiff5-dev
- Closes: #681077
- - cme fix dpkg-control
- - debhelper 9
- - Debian Science team maintenance
- - Fix Homepage
-
- -- Andreas Tille <tille at debian.org> Wed, 12 Feb 2014 10:17:38 +0100
++libvigraimpex (1.10.0+dfsg-8) experimental; urgency=medium
++
++ * deb/control:
++ + change of maintainer (Closes: #587063).
++ + bumped Debhelper level to 9 (also in deb/compat).
++ + added dh-python to b-deps.
++ + depend on libtiff5-dev (Closes: #681077).
++ + bumped standards to 3.9.6 (no changes needed).
++ * deb/copyright:
++ + added DEP-5 compliant Format line.
++ + removed trailing commas, indented, sorted properly; updated.
++ * deb/rules:
++ + straightened arch dependend flag generation.
++ + removed Vim control line.
++ * deb/watch: updated to Github repo.
++ * Patches:
++ + removed-static-docs.diff: added DEP-3 compliant header.
++ + dropped disable-noise-variance-clustering-vigranumpy-test.diff
++ (not needed anymore, Closes: #588167).
++ + added off-by-on-in-exportImageAlpha.diff.
++ * wrap-and-sort -a -s.
++
++ -- Daniel Stender <debian at danielstender.com> Wed, 11 Feb 2015 17:13:23 +0100
++
++libvigraimpex (1.10.0+dfsg-7) experimental; urgency=medium
++
++ * QA upload.
++ * Support hdf5 1.8.13 new packaging layout. (Patch by Gilles Filippini)
++ Closes: #756677
++
++ -- Andreas Metzler <ametzler at debian.org> Sat, 02 Aug 2014 14:31:14 +0200
++
++libvigraimpex (1.10.0+dfsg-6) experimental; urgency=medium
++
++ * QA upload.
++ * Rebuild with new toolchain (gcc-4.9).
++
++ -- Andreas Metzler <ametzler at debian.org> Sat, 26 Jul 2014 14:00:42 +0200
++
++libvigraimpex (1.10.0+dfsg-5) experimental; urgency=medium
++
++ * QA upload.
++ * Use ggc-min-expand for mips.
++ Patch by Dejan Latinovic <Dejan.Latinovic at imgtec.com>.
++ Closes: #750418.
++
++ -- Anibal Monsalve Salazar <anibal at debian.org> Wed, 11 Jun 2014 08:31:01 +0100
++
++libvigraimpex (1.10.0+dfsg-4) experimental; urgency=medium
++
++ * Reupload to experminental to test buildability with newer toolchain.
++ This version does not FTBFS on i386 at least. Closes: #750418
++
++ -- Andreas Metzler <ametzler at debian.org> Mon, 09 Jun 2014 07:37:12 +0200
++
++libvigraimpex (1.10.0+dfsg-3) experimental; urgency=medium
++
++ * QA upload.
++ * Build with -pipe.
++
++ -- Andreas Metzler <ametzler at debian.org> Mon, 27 Jan 2014 17:27:13 +0100
++
++libvigraimpex (1.10.0+dfsg-2) experimental; urgency=medium
++
++ * QA upload.
++ * (Build-)Depend on libhdf5-dev instead of removed transitional package
++ libhdf5-serial-dev. Closes: #735569
++ * (Build-)Depend on libtiff-dev instead of transitional package
++ libtiff4-dev.
++
++ -- Andreas Metzler <ametzler at debian.org> Sat, 18 Jan 2014 16:23:38 +0100
++
++libvigraimpex (1.10.0+dfsg-1) experimental; urgency=low
++
++ * QA upload.
++ * Update watchfile.
++ * Use xz compression for source tarball.
++ * New upstream version.
++ + Drop patches previously pulled from upstream
++ 20_increased-tolerance-tests.diff
++ ref-to-temporary-in-Sampler.diff
++ + soname bumped, change package name.
++ + Filename of upstream README changed.
++
++ -- Andreas Metzler <ametzler at debian.org> Sat, 07 Dec 2013 19:56:15 +0100
+
+libvigraimpex (1.9.0+dfsg-7) unstable; urgency=low
+
+ * QA upload.
+ * Make debian/rules work with both multiarch and non-multiarch
+ libboost-python. (This supersedes the change in
+ Ubuntu 1.9.0+dfsg-6ubuntu2.)
+
+ -- Andreas Metzler <ametzler at debian.org> Sat, 05 Oct 2013 13:45:19 +0200
+
+libvigraimpex (1.9.0+dfsg-6) unstable; urgency=low
+
+ * QA upload.
+ * Drop parallell build support.
+
+ -- Andreas Metzler <ametzler at debian.org> Fri, 05 Jul 2013 19:05:49 +0200
+
+libvigraimpex (1.9.0+dfsg-5) unstable; urgency=low
+
+ * Also append CPPFLAGS to CXXFLAGS.
+ * Increase minimum memory requirement for parallel build on buildd by factor
+ three since s390 exhausted virtual memory on parallel build.
+
+ -- Andreas Metzler <ametzler at debian.org> Thu, 04 Jul 2013 19:08:27 +0200
+
+libvigraimpex (1.9.0+dfsg-4) unstable; urgency=low
+
+ * QA upload.
+ * Switch back to tiff4, we do not want to start our own
+ mini-tiff-transition.
+ * Upload to unstable.
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 16 Jun 2013 13:57:23 +0200
+
+libvigraimpex (1.9.0+dfsg-3) experimental; urgency=low
+
+ * QA upload.
+ * [ref-to-temporary-in-Sampler.diff] Fix FTBFS witch gcc-4.8.
+ Closes: #701313
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 19 May 2013 15:44:09 +0200
+
+libvigraimpex (1.9.0+dfsg-2) experimental; urgency=low
+
+ * QA upload.
+ * [20_increased-tolerance-tests.diff] from upstream GIT: Increase tolerance
+ for a few tests hopefully fixing testsuite errors on s390x and ia64.
+
+ -- Andreas Metzler <ametzler at debian.org> Tue, 23 Apr 2013 19:10:22 +0200
+
+libvigraimpex (1.9.0+dfsg-1) experimental; urgency=low
+
+ * QA upload.
+ * New upstream version.
+ * Partial sync from Ubuntu:
+ + Unfuzz patches docsrc-out-of-source.diff and docsrc-paths.diff
+ + Drop no-offline-ps-doc.diff, doxygen-1.8.diff and gcc-4.7-fixes.diff,
+ included upstream.
+ + Drop gzipped-tutorial-reference.diff, pointing to upstream copy instead.
+ + Downgrade python-h5py from python-vigra's Recommends to Suggests.
+ * Use $(wildcard) to find both multiarched and regular libpython.
+ * Explicitly enable OpenEXR-support, it is not selected automatically
+ anymore.
+ * Bump shlibs.
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 07 Apr 2013 13:38:04 +0200
+
+libvigraimpex (1.8.0+dfsg-2) experimental; urgency=low
+
+ * QA upload.
+ * Enable OpenEXR support by adding a build-dependency on libopenexr-dev.
+ * Stop using .symbols files, and use 'dh_makeshlibs -V ...' to version the
+ shlibs file. This fixes FTBFS with diffferent gcc != 4.7.
+ Closes: #691095
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 13 Jan 2013 13:10:39 +0100
+
+libvigraimpex (1.8.0+dfsg-1) experimental; urgency=low
+
+ * QA upload.
+ * New upstream version.
+ * Update patches for new upstream release.
+ * Bump libvigraimpex soname to 4, update symbols file.
+ * Fix (new?) GCC 4.7 build failures.
+ * Fix build failure with doxygen 1.8.x.
+ * Build using dh_python2.
+ * debian/rules: Remove -mieee for sh4, it's now the default.
+ * Build with -ffloat-store on i386, to let the testsuite pass.
+ * Don't stop running the testsuite on the first error.
+ * On powerpc, run the tests, but ignore the test results.
+ It's likely that the build will fail on other archs, after
+ inspecting the test results, the outcome of the test should be
+ disabled or the precision for some tests be adjusted.
+
+ -- Matthias Klose <doko at debian.org> Wed, 26 Sep 2012 23:52:37 +0200
+
+libvigraimpex (1.7.1+dfsg1-3) unstable; urgency=low
+
+ * QA upload
+ * Fix build failure with GCC 4.7. Closes: #667258.
+ * Build-depend on libpng-dev. Closes: #662414.
+
+ -- Matthias Klose <doko at debian.org> Mon, 16 Apr 2012 23:06:00 +0200
+
+libvigraimpex (1.7.1+dfsg1-2) unstable; urgency=low
+
+ * QA upload
+ * Patch libpng15: Fix FTBFS with libpng 1.5 (closes: #636003). Thanks to
+ Nobuhiro Iwamatsu and Joachim Schleicher for forwarding and testing
+ the patch.
+ * Replace build-dependency on libpng12-dev by libpng-dev | libpng12-dev
+ in order to ease the upcoming libpng transition.
+ * Fix FTBFS on sh4 architecture by using -mieee flag (closes: #633818).
+ Thanks to Nobuhiro Iwamatsu for the patch!
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 04 Aug 2011 13:57:08 +0200
+
+libvigraimpex (1.7.1+dfsg1-1) unstable; urgency=low
+
+ * QA upload.
+ * Set maintainer to Debian QA Group.
+ * Demote Recommends of the documentation packages to Suggests.
+ * Drop fix-tinyvectortest.diff, no longer needed.
+ * Drop Vcs-* fields.
+ * Strip jQuery code from .orig.tar.gz, as we don't have source for it.
+ + Update debian/get-orig-source.sh, debian/rules, debian/watch.
+ + Update debian/copyright.
+ * Overhaul debian/rules. Stop using dh.
+ * Use dh_sphinxdoc:
+ + Update debian/control to use ${sphinxdoc:Depends} instead of hardcoded
+ libjs-jquery.
+ + Call it in debian/rules if it's installed. Otherwise, generate substvars
+ manually.
+ * Add missing build-dependency on python-support.
+
+ -- Jakub Wilk <jwilk at debian.org> Tue, 12 Jul 2011 19:34:24 +0200
+
+libvigraimpex (1.7.1+dfsg-8) unstable; urgency=low
+
+ * Unbreak fix-tinyvectortest.diff.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 25 May 2011 01:21:31 +0200
+
+libvigraimpex (1.7.1+dfsg-7) unstable; urgency=low
+
+ * To fix FTBFS on s390, rewrite a loop in TinyVectorTest::equalIter(), so
+ that it doesn't trigger bug in GCC 4.6 (see Debian bug #627795).
+ [fix-tinyvectortest.diff]
+
+ -- Jakub Wilk <jwilk at debian.org> Tue, 24 May 2011 22:09:12 +0200
+
+libvigraimpex (1.7.1+dfsg-6) unstable; urgency=low
+
+ * To fix FTBFS on powerpc with GCC 4.6, use epsilon comparison in
+ ConvolutionTest::recursiveFilterTestFromRepeatWithAvoid. Thanks to Stefano
+ Rivera for debugging and for the patch. [fix-convolutiontest.diff]
+ * Allow libvigraimpex-dev to be co-installable with over providers of
+ libhdf5-dev than libhdf5-serial-dev (closes: #627421). Thanks to Laurent
+ Bonnaud for the bug report.
+
+ -- Jakub Wilk <jwilk at debian.org> Fri, 20 May 2011 20:24:30 +0200
+
+libvigraimpex (1.7.1+dfsg-5) unstable; urgency=low
+
+ * Use default Python version when building documentation.
+ * Update docsrc-doxygen-1.7.diff to deal with the latest Doxygen.
+ * Remove unused jquery.js from libvigraimpex-doc.
+ * Add a missing include to fix FTBFS with GCC 4.6 (closes: #625104). Thanks
+ to Lucas Nussbaum for the bug report. [fix-ftbfs-gcc4.6.diff]
+ * Bump standards version to 3.9.2 (no changes needed).
+ * Mark more symbols as optional.
+
+ -- Jakub Wilk <jwilk at debian.org> Mon, 02 May 2011 19:47:58 +0200
+
+libvigraimpex (1.7.1+dfsg-4) unstable; urgency=low
+
+ * Preserve symlinks when copying object files from one build directory to
+ another (closes: #618667).
+
+ -- Jakub Wilk <jwilk at debian.org> Sun, 20 Mar 2011 15:50:05 +0100
+
+libvigraimpex (1.7.1+dfsg-3) unstable; urgency=low
+
+ * Update the symbols file.
+ * On buildds, artificially limit paralellism in order not to run out of RAM.
+
+ -- Jakub Wilk <jwilk at debian.org> Tue, 15 Mar 2011 15:14:04 +0100
+
+libvigraimpex (1.7.1+dfsg-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * Fix patch headers to be in line with DEP-3.
+ * Update the symbols file.
+
+ -- Jakub Wilk <jwilk at debian.org> Sat, 12 Mar 2011 20:29:34 +0100
+
+libvigraimpex (1.7.1+dfsg-1) experimental; urgency=low
+
+ * New upstream release.
+ + Drop numpy-double-longdouble.diff, applied upstream.
+ + Drop noise-normalization-invariant.diff, applied upstream.
+ + Update debian/copyright.
+ + Rename libvigraimpex2 to libvigraimpex3, following SONAME bump.
+ + Update the symbols file.
+ + Include the vigra-config script.
+ + Patch it to return correct documentation path.
+ [vigra-config-docdir.diff]
+ + Update debian/NEWS.
+ + Provide a new manual page.
+ * Update patch headers.
+ * Export LDFLAGS.
+ * Remove Win32-only files and pre-built documentation from the .orig
+ tarball to save some space.
+ * Respect DEB_BUILD_OPTIONS=parallel=N.
+ * Respect DEB_BUILD_OPTIONS=noopt.
+ * Rename some private variables in debian/rules to make them lowercase.
+ * Require that Numpy is usable with every supported Python version.
+ * Avoid using SONAMEs in Python extension modules.
+ * Convert debian/copyright to the latest DEP-5 version.
+ * Install symlinks from /usr/share/doc/libvigraimpex-dev/html to
+ /usr/share/doc/libvigraimpex-doc/html.
+ * Install symlinks from /usr/share/doc/python-vigra/{html,rst} to
+ /usr/share/doc/python-vigra-doc/{html,rst}.
+ * Build Python extensions with -fno-strict-aliasing.
+ * Remove ‘debian/tmp’ prefix from debian/*.install files.
+ * Provide ‘build-arch’ and ‘build-indep’ targets in debian/rules.
+ * Use an alternative dependency template in the symbols file to make sure
+ that a strict versioned dependency on the shared library will be generated
+ for packages using optional (private) symbols.
+
+ -- Jakub Wilk <jwilk at debian.org> Sun, 20 Feb 2011 23:21:40 +0100
+
+libvigraimpex (1.7.0+dfsg-7) unstable; urgency=low
+
+ * Bump all versions in the symbols file to 1.7.0.
+ * Make python-vigra-doc recommend libvigraimpex-doc.
+ * Make libvigraimpex-doc suggest python-vigra-doc.
+ * Fix documentation generation with Doxygen 1.7.
+ * Fix hyperlinks from the C++ library documentation to python-vigra
+ documentation (closes: #590069) and the other way round (closes: #590068).
+ [docsrc-paths.diff]
+ * Stop using g++-4.3 on hppa, as #585925 is fixed now (closes: #588168).
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 25 Aug 2010 20:54:45 +0200
+
+libvigraimpex (1.7.0+dfsg-6) unstable; urgency=low
+
+ * Fix generation of dependencies on python-numpy to take epochs into
+ account. Use dh_numpy provided by python-numpy if available.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 28 Jul 2010 12:15:09 +0200
+
+libvigraimpex (1.7.0+dfsg-5) unstable; urgency=low
+
+ * To fix ABI breakage, rename binary package from libvigraimpex2ldbl to
+ libvigraimpex2 (closes: #589779).
+ * Bump standards version to 3.9.1 (no changes needed).
+ * Automatically generate versioned dependencies on python-numpy.
+
+ -- Jakub Wilk <jwilk at debian.org> Mon, 26 Jul 2010 23:17:03 +0200
+
+libvigraimpex (1.7.0+dfsg-4) unstable; urgency=low
+
+ * Bump standards version to 3.9.0 (no changes needed).
+ * In order to mitigate bug #586247, add invariant check to
+ noiseVarianceListMedianCut(). [noise-normalization-invariant.diff]
+ * For the time being, disable failing vigranumpy test for
+ noiseVarianceClustering(); see bug #586247.
+ [disable-noise-variance-clustering-vigranumpy-test.diff]
+ * Update headers for patches that has been applied upstream.
+
+ -- Jakub Wilk <jwilk at debian.org> Mon, 05 Jul 2010 17:18:21 +0200
+
+libvigraimpex (1.7.0+dfsg-3) unstable; urgency=low
+
+ * New upstream release, which includes backwards-incompatible changes (see
+ NEWS.Debian for details).
+ * Drop all existing patches: they have been either applied upstream or
+ become irrelevant.
+ * Upstream added support for HDF5:
+ + Add libhdf5-serial-dev to Build-Depends and Depends of
+ libvigraimpex-dev.
+ * Upstream has implemented new build system on the basis of cmake:
+ + Build-depend on cmake.
+ + Reimplement debian/rules from scratch; update other files in debian/
+ accordingly.
+ + Drop vigra-config along with its manual page.
+ + No longer provide static library.
+ * Simplify makefile for examples.
+ * Build Python bindings for VIGRA:
+ + Build-depend on python-all-dev, python-numpy, libboost-python-dev,
+ python-sphinx.
+ + Patch documentation generation system to support out-of-source building.
+ [docsrc-out-of-source.diff]
+ * Run tests at build time.
+ + Build-depend on python-nose.
+ * Update the symbols file.
+ * Update the watch file.
+ * Install JPEG files into examples, too.
+ * Update debian/copyright and convert it do DEP-5 format.
+ * Fix link in the documentation to cope with the fact that
+ tutorial_reference.pdf is compressed in the binary package.
+ [gzipped-tutorial-reference.diff]
+ * Don't declare the same NumpyArrayValuetypeTraits instance twice if
+ sizeof(double) == sizeof(long double); fix FTBFS on such architectures
+ (closes: #581688). [numpy-double-longdouble.diff]
+ * Use g++-4.3 on hppa for the time being (closes: #582379). g++-4.4 is known
+ to generate buggy code, see bug #585925.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 16 Jun 2010 01:12:04 +0200
+
+libvigraimpex (1.6.0+dfsg1-1) unstable; urgency=low
+
+ * Drop README.source, no longer needed.
+ * Strip PostScript documents without source from the .orig.tar.gz
+ (closes: #580154):
+ + Update get-orig-source target.
+ + Update links in the HTML documentation to point to copies of these
+ documents on VIGRA homepage. [no-offline-ps-doc.diff]
+
+ -- Jakub Wilk <jwilk at debian.org> Mon, 10 May 2010 19:07:57 +0200
+
+libvigraimpex (1.6.0+dfsg-2) unstable; urgency=low
+
+ * Update symbols file to fix FTBFS on sparc64.
+ * Bump standards version to 3.8.4 (no changes needed).
+ * Update my e-mail address.
+ * Replace (build-)dependency on libjpeg62-dev with libjpeg-dev
+ (closes: #569280).
+ * Switch to source format 3.0 (quilt). Drop build-dependency on quilt and
+ adjust debian/rules accordingly.
+ * Fix a typo in src/impex/tiff.cxx (tiff-typo.diff).
+ * Update patch descriptions.
+
+ -- Jakub Wilk <jwilk at debian.org> Thu, 11 Feb 2010 13:02:46 +0100
+
+libvigraimpex (1.6.0+dfsg-1) unstable; urgency=low
+
+ * Use upstream VCS to recreate .orig.tar.gz with the documentation source
+ included (closes: #547943).
+ * Fix documentation generator to be compatible with recent Doxygen
+ (docsrc-doxygen-any-version.diff). Documentation is now regenerated at
+ build time.
+ * Use sed+tr (rather than lynx) to convert upstream changelog to text.
+ * Avoid copy-all-remove-some in the install target.
+ * Add Vcs-* fields.
+ * Mark more symbols as optional.
+
+ -- Jakub Wilk <ubanus at users.sf.net> Fri, 09 Oct 2009 21:25:37 +0200
+
+libvigraimpex (1.6.0-2) unstable; urgency=low
+
+ * Make debian/rules safe for parallel builds.
+ * Don't install *.la files.
+ * Include symbols file.
+ * Drop runtime dependency on fftw3.
+
+ -- Jakub Wilk <ubanus at users.sf.net> Thu, 03 Sep 2009 15:37:01 +0200
+
+libvigraimpex (1.6.0-1) unstable; urgency=low
+
+ * New upstream release (closes: #419431, #540242).
+ * New maintainer (closes: #503486).
+ * Use quilt to manage patches.
+ * Add resampleImage() with different x- and y-factors
+ (resample-image-different-xy.diff backported from the upstream VCS;
+ closes: #540334).
+ * Fix a typo in src/impex/viff.cxx (viff-typo.diff).
+ * Sanitize the upstream build system (build-system.diff); run
+ autoreconf at build time; remove all autogenerated files at build time.
+ * Rewrite debian/rules from scratch; use dh from debhelper 7.
+ * Provide a separate documentation package.
+ * Update the examples Makefile.
+ * Depend of lynx-cur rather than lynx.
+ * Bump standards version to 3.8.3 (no changes needed).
+ * Drop initial articles from package descriptions.
+ * Update the homepage URL.
+ * Update debian/copyright.
+
+ -- Jakub Wilk <ubanus at users.sf.net> Mon, 17 Aug 2009 22:32:07 +0200
+
+libvigraimpex (1.5.0-2) unstable; urgency=low
+
+ * QA upload.
+ + Set maintainer to Debian QA Group <packages at qa.debian.org>.
+ * Acknowledge NMUs.
+ * Add Homepage.
+ * Add watch file.
+ * Make clean not ignore errors.
+ * Update ${Source-Version} depends to ${binary:Version}.
+ * Convert debian/copyright to UTF-8.
+ * Update fftw3-dev build-depends to libfftw3-dev.
+ * Update fftw3 dependency to libfftw3-3.
+ * Remove redundant section from libvigraimpex binary.
+ * Fix short descriptions.
+ * Add proper copyright holders to debian/copyright.
+ * Bump debhelper build-dep and compat to 5.
+ * Bump Standards Version to 3.8.0.
+
+ -- Barry deFreese <bdefreese at debian.org> Mon, 02 Feb 2009 17:07:57 -0500
+
+libvigraimpex (1.5.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libvigraimpex2 for the ldbl128 transition (Closes: #430309).
+
+ -- Luk Claes <luk at debian.org> Sat, 02 Feb 2008 14:56:45 +0000
+
+libvigraimpex (1.5.0-1) unstable; urgency=low
+
+ * New upstream release. Several additions and improvements. Bug
+ fixes in code and documentation. Improved the Image Import/Export
+ Facilities. Improved support of 64-bit compilers. Added elliptic
+ integrals.
+
+ -- Alejandro Sierra <algsierra at gmail.com> Sat, 9 Dec 2006 11:45:33 -0600
+
+libvigraimpex (1.4.0-1) unstable; urgency=low
+
+ * Initial Release. (Closes: #251616)
+
+ -- Alejandro Sierra <algsierra at gmail.com> Sun, 21 Dec 2005 14:07:11 -0500
+
diff --cc debian/control
index 2d7b178,0000000..3b054af
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,125 -1,0 +1,137 @@@
+Source: libvigraimpex
- Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
- Uploaders: Andreas Tille <tille at debian.org>
+Section: libs
+Priority: optional
- Build-Depends: debhelper (>= 9),
- cmake,
- libfftw3-dev,
- libpng-dev,
- libjpeg-dev,
- libtiff5-dev,
- libhdf5-serial-dev,
- python-all-dev,
- python-numpy,
- libboost-python-dev,
- python-nose,
- libopenexr-dev
- Build-Depends-Indep: python,
- python-sphinx,
- doxygen,
- texlive-latex-base,
- ghostscript
- Build-Conflicts: autoconf2.13
- Standards-Version: 3.9.5
- Vcs-Git: git://anonscm.debian.org/debian-science/packages/libvigraimpex.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/libvigraimpex.git
- Homepage: http://ukoethe.github.io/vigra/
++Maintainer: Daniel Stender <debian at danielstender.com>
++Build-Depends:
++ cmake,
++ debhelper (>= 9),
++ dh-python,
++ dpkg-dev (>= 1.15.3~),
++ libboost-python-dev,
++ libfftw3-dev,
++ libhdf5-dev (>= 1.8),
++ libjpeg-dev,
++ libopenexr-dev,
++ libpng-dev,
++ libtiff5-dev,
++ python-all-dev,
++ python-nose,
++ python-numpy
++Build-Depends-Indep:
++ doxygen,
++ ghostscript,
++ python,
++ python-sphinx,
++ texlive-latex-base
++Build-Conflicts:
++ autoconf2.13
+X-Python-Version: >= 2.5
++Standards-Version: 3.9.6
++Homepage: http://hci.iwr.uni-heidelberg.de/vigra/
+
+Package: libvigraimpex-dev
- Architecture: any
+Section: libdevel
- Depends: ${misc:Depends},
- ${python:Depends},
- libvigraimpex5 (= ${binary:Version}),
- libhdf5-serial-dev | libhdf5-dev,
- libfftw3-dev,
- libpng12-dev,
- libjpeg-dev,
- libtiff5-dev
- Suggests: libvigraimpex-doc
++Architecture: any
++Depends:
++ libfftw3-dev,
++ libhdf5-dev (>= 1.8),
++ libjpeg-dev,
++ libpng12-dev,
++ libtiff5-dev,
++ libvigraimpex5 (= ${binary:Version}),
++ ${misc:Depends},
++ ${python:Depends}
++Suggests:
++ libvigraimpex-doc
+Description: development files for the C++ computer vision library
+ Vision with Generic Algorithms (VIGRA) is a computer vision library
+ that puts its main emphasis on flexible algorithms, because
+ algorithms represent the principle know-how of this field. The
+ library was consequently built using generic programming as
+ introduced by Stepanov and Musser and exemplified in the C++ Standard
+ Template Library. By writing a few adapters (image iterators and
+ accessors) you can use VIGRA's algorithms on top of your data
- structures, within your environment.
- .
++ structures, within your environment.
++ .
+ This package contains the header and development files needed to
+ build programs and packages using VIGRA.
+
+Package: libvigraimpex5
+Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends}
++Depends:
++ ${misc:Depends},
++ ${shlibs:Depends}
+Description: C++ computer vision library
- Vision with Generic Algorithms (VIGRA) is a computer vision library
++ Vision with Generic Algorithms (VIGRA) is a computer vision library
+ that puts its main emphasis on flexible algorithms, because
+ algorithms represent the principle know-how of this field. The
+ library was consequently built using generic programming as
+ introduced by Stepanov and Musser and exemplified in the C++ Standard
+ Template Library. By writing a few adapters (image iterators and
+ accessors) you can use VIGRA's algorithms on top of your data
- structures, within your environment.
++ structures, within your environment.
+
+Package: libvigraimpex-doc
- Architecture: all
+Section: doc
- Depends: ${misc:Depends}
- Suggests: libvigraimpex-dev,
- python-vigra-doc
++Architecture: all
++Depends:
++ ${misc:Depends}
++Suggests:
++ libvigraimpex-dev,
++ python-vigra-doc
+Description: Documentation for the C++ computer vision library
+ Vision with Generic Algorithms (VIGRA) is a computer vision library
+ that puts its main emphasis on flexible algorithms, because
+ algorithms represent the principle know-how of this field. The
+ library was consequently built using generic programming as
+ introduced by Stepanov and Musser and exemplified in the C++ Standard
+ Template Library. By writing a few adapters (image iterators and
+ accessors) you can use VIGRA's algorithms on top of your data
- structures, within your environment.
- .
++ structures, within your environment.
++ .
+ This package contains documentation for the VIGRA library.
+
+Package: python-vigra
- Architecture: any
+Section: python
- Depends: ${misc:Depends},
- ${shlibs:Depends},
- ${python:Depends}
- Recommends: python-qt4
- Suggests: python-vigra-doc,
- python-h5py
++Architecture: any
++Depends:
++ ${misc:Depends},
++ ${python:Depends},
++ ${shlibs:Depends}
++Recommends:
++ python-qt4
++Suggests:
++ python-h5py,
++ python-vigra-doc
+Description: Python bindings for the C++ computer vision library
+ Vision with Generic Algorithms (VIGRA) is a computer vision library
+ that puts its main emphasis on flexible algorithms, because
+ algorithms represent the principle know-how of this field. The
+ library was consequently built using generic programming as
+ introduced by Stepanov and Musser and exemplified in the C++ Standard
+ Template Library. By writing a few adapters (image iterators and
+ accessors) you can use VIGRA's algorithms on top of your data
+ structures, within your environment.
+ .
+ This package exports the functionality of the VIGRA library to Python.
+
+Package: python-vigra-doc
- Architecture: all
+Section: doc
- Depends: ${misc:Depends},
- ${sphinxdoc:Depends}
- Suggests: python-vigra,
- libvigraimpex-doc
++Architecture: all
++Depends:
++ ${misc:Depends},
++ ${sphinxdoc:Depends}
++Suggests:
++ libvigraimpex-doc,
++ python-vigra
+Description: Documentation for Python bindings for the C++ computer vision library
+ Vision with Generic Algorithms (VIGRA) is a computer vision library
+ that puts its main emphasis on flexible algorithms, because
+ algorithms represent the principle know-how of this field. The
+ library was consequently built using generic programming as
+ introduced by Stepanov and Musser and exemplified in the C++ Standard
+ Template Library. By writing a few adapters (image iterators and
+ accessors) you can use VIGRA's algorithms on top of your data
+ structures, within your environment.
+ .
+ This package contains documentation for Python bindings for the VIGRA library.
diff --cc debian/copyright
index 8e589b1,0000000..05f43d0
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,59 -1,0 +1,61 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: VIGRA
+Upstream-Contact: Ullrich Köthe <ullrich.koethe at iwr.uni-heidelberg.de>
- Source: http://ukoethe.github.io/vigra/
- Files-Excluded:
- vigra-*win32*.zip
- .g*
- .h*
- .t*
- doc/vigra
- doc/vigranumpy
- docsrc/documents
++Source: http://hci.iwr.uni-heidelberg.de/vigra/
++
++Files: *
+Comment:
+ PostScript documents without source has been stripped from the Debian
+ version of this package.
-
- Files: *
- Copyright: 1998-2012, Ullrich Köthe
- 1998-2010, Hans Meine
- 2010, Joachim Schleicher
- 2009, Nico Splitthoff
- 2008-2009, Rahul Nair
- 2009, Michael Hanselmann
- 1998-2008, Gunnar Kedenburg
- 1998-2002, Pablo d'Angelo
- 2003-2004, 2006-2007, B. Seppke
- 2003-2004, 2006-2007, F. Heinrich
- 2003-2007, Kasim Terzic
- 2003-2007, Christian-Dennis Rahn
- 1999, Paul Moore
- 2011-2012 by Markus Nullmeier
- 2012 Christoph Spiel
- 2011-2012 by Stefan Schmidt
- 2012 by Frank Lenzen
++Copyright: 1998-2013 Ullrich Köthe
++ 1998-2002, 2007 Pablo d'Angelo
++ 2012-2013 Thorsten Beier
++ 2009-2011 Janis Fehr
++ 2008-2011 Michael Hanselmann
++ 2003-2004, 2006-2007 F. Heinrich
++ 2011 Lukas Jirkovsky
++ 1998-2013 Gunnar Kedenburg
++ 2009-2013 Thorben Kroeger
++ 2012 Frank Lenzen
++ 1998-2010 Hans Meine
++ 1999 Paul Moore
++ 2003-2009 Rahul Nair
++ 2011-2012 Markus Nullmeier
++ 2003-2007 Christian-Dennis Rahn
++ 2010 Joachim Schleicher
++ 2011-2012 Stefan Schmidt
++ 2003-2004, 2006-2007 B. Seppke
++ 2012 Christoph Spiel
++ 2009 Nico Splitthoff
++ 1993 Sun Microsystems, Inc.
++ 2003-2007 Kasim Terzic
++ 2011 Michael Tesch
+License: MIT
+
+Files: debian/*
- Copyright: 1995-1996, Alejandro Sierra
- 2009-2011, Jakub Wilk
++Copyright: 1995-1996 Alejandro Sierra
++ 2009-2011 Jakub Wilk
++ 2011 Ralf Treinen
++ 2012-2013 Matthias Klose
++ 2013-2014 Andreas Metzler
++ 2015 Daniel Stender
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the “Software”), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
diff --cc debian/dh_numpy
index 0000000,0000000..0ed4760
new file mode 100755
--- /dev/null
+++ b/debian/dh_numpy
@@@ -1,0 -1,0 +1,33 @@@
++#!/usr/bin/perl -w
++
++use strict;
++use File::Find;
++use Debian::Debhelper::Dh_Lib;
++
++init();
++
++my $numpy_next_version;
++my $numpy_version = `python -c 'from numpy import __version__; print __version__'`;
++if (! defined $numpy_version || $numpy_version eq "")
++{
++ error("Numpy is not installed, aborting. (Probably forgot to Build-Depend on python-numpy.)");
++}
++elsif ($numpy_version =~ m/^(\d+)[.](\d+)([.]\d+)*/)
++{
++ $numpy_version = sprintf("%d.%d", $1, $2);
++ $numpy_next_version = sprintf("%d.%d", $1, $2 + 1);
++}
++else
++{
++ error("Unable to parse Numpy version out of \"$numpy_version\".");
++}
++
++foreach my $package (@{$dh{DOPACKAGES}})
++{
++ addsubstvar($package, "python:Depends",
++ "python-numpy (>= 1:$numpy_version), " .
++ "python-numpy (<< 1:$numpy_next_version)"
++ );
++}
++
++# vim:ts=4 sw=4 et
diff --cc debian/get-orig-source.sh
index 0000000,0000000..6df3ff9
new file mode 100755
--- /dev/null
+++ b/debian/get-orig-source.sh
@@@ -1,0 -1,0 +1,35 @@@
++#!/bin/sh
++set -e
++export GZIP="-9 -n"
++export TAR_OPTIONS="--owner root --group root --mode a+rX"
++pwd=`pwd`
++dfsgversion="$1"
++version="${1%+dfsg*}"
++if [ -z "$version" ]
++then
++ printf 'Usage: %s <version>\n' "$0"
++ exit 1
++fi
++cd "`dirname "$0"`/../"
++tmpdir=`mktemp -d get-orig-source.XXXXXX`
++uscan --noconf --force-download --rename --download-version="$version" --destdir="$tmpdir"
++cd "$tmpdir"
++tar -xzf libvigraimpex_*.orig.tar.gz
++rm *.tar.gz
++# Remove documentation without source:
++find vigra-* -name '*.ps' -delete
++# Remove not-for-us stuff:
++rm -v vigra-*/*win32*.zip
++# Remove documentation that we'll rebuild anyway:
++rm -v vigra-*/doc/vigra/*.html
++rm -v vigra-*/doc/vigra/*.png
++rm -rv vigra-*/doc/vigranumpy/
++rm -rv vigra-*/vigranumpy/docsrc/_static/
++# Remove Mercurial artifacts:
++rm -v vigra-*/.hg*
++mv vigra-*/ "vigra-${version%+dfsg*}.orig"
++tar -cJf "$pwd/libvigraimpex_$dfsgversion.orig.tar.xz" vigra-*.orig/
++cd ..
++rm -Rf "$tmpdir"
++
++# vim:ts=4 sw=4 et
diff --cc debian/libvigraimpex5.docs
index 07e0db4,0000000..b43bf86
mode 100644,000000..100644
--- a/debian/libvigraimpex5.docs
+++ b/debian/libvigraimpex5.docs
@@@ -1,1 -1,0 +1,1 @@@
- README.*
++README.md
diff --cc debian/patches/docsrc-out-of-source.diff
index 09bd075,0000000..4526faf
mode 100644,000000..100644
--- a/debian/patches/docsrc-out-of-source.diff
+++ b/debian/patches/docsrc-out-of-source.diff
@@@ -1,16 -1,0 +1,18 @@@
+Description: Add support for out-of-source documentation building.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: not-needed
+Last-Update: 2010-04-16
+
++Index: b/docsrc/makeFunctionIndex.py
++===================================================================
+--- a/docsrc/makeFunctionIndex.py
++++ b/docsrc/makeFunctionIndex.py
- @@ -143,7 +143,7 @@ generateFunctionIndex(functionList)
++@@ -139,7 +139,7 @@
+ # crosslinking of vigranumpy documentation.
+ # Note that '::' are not allowed in reStructuedText link names,
+ # so we have to use '.' instead.
+-replaces=open("../vigranumpy/docsrc/c_api_replaces.txt","w")
++replaces=open("../../vigranumpy/docsrc/c_api_replaces.txt","w")
+ for i in range(len(functionList)):
+ functionName = functionList[i][1]
+ overloadDisambiguation = functionList[i][2]
diff --cc debian/patches/docsrc-paths.diff
index 40ef40b,0000000..1dd6233
mode 100644,000000..100644
--- a/debian/patches/docsrc-paths.diff
+++ b/debian/patches/docsrc-paths.diff
@@@ -1,68 -1,0 +1,76 @@@
+Description: Fix hyperlinks from the C++ library documentation to python-vigra documentation and the other way round.
+Bug-Debian: http://bugs.debian.org/590069
+Bug-Debian: http://bugs.debian.org/590068
+Forwarded: not-needed
+Last-Update: 2011-03-02
+
++Index: b/docsrc/credits_changelog.dxx
++===================================================================
+--- a/docsrc/credits_changelog.dxx
++++ b/docsrc/credits_changelog.dxx
+@@ -43,7 +43,7 @@
+ also contributed his pLSA (probabilistic latent semantic analysis) implementation.
+
+ <li> Nathan Huesken and Christoph Sommer helped a lot in developing
+- <a href="../vigranumpy/index.html">vigranumpy</a>, the VIGRA Python bindings.
++ <a href="/usr/share/doc/python-vigra-doc/html/index.html">vigranumpy</a>, the VIGRA Python bindings.
+
+ <li> Jens-Malte Gottfried contributed to the cmake-based build system.
+
- @@ -224,7 +224,7 @@ Many thanks to all!
++@@ -177,7 +177,7 @@
+
+ <li> Added \ref vigra::NumpyAnyArray and \ref vigra::NumpyArray, improved \ref vigra::MultiArrayView.
+
+- <li> Added <b><a href="../vigranumpy/index.html">vigranumpy</a></b> (VIGRA Python bindings).
++ <li> Added <b><a href="/usr/share/doc/python-vigra-doc/html/index.html">vigranumpy</a></b> (VIGRA Python bindings).
+
+ <li> Added \ref VigraMatlab.
+
++Index: b/docsrc/index.dxx
++===================================================================
+--- a/docsrc/index.dxx
++++ b/docsrc/index.dxx
- @@ -37,7 +37,7 @@
++@@ -32,7 +32,7 @@
+ <BR> <em>Demonstration programs for VIGRA's usage </em>
+ <LI> \ref VigraMatlab
+ <BR> <em>VIGRA Matlab bindings</em>
+- <LI> <b><a href="../vigranumpy/index.html">vigranumpy</a></b>
++ <LI> <b><a href="/usr/share/doc/python-vigra-doc/html/index.html">vigranumpy</a></b>
+ <BR> <em>VIGRA Python bindings</em>
+ <LI> \ref CreditsChangelog
+ <BR> <em>Who contributed what?</em>
++Index: b/vigranumpy/docsrc/conf.py.in
++===================================================================
+--- a/vigranumpy/docsrc/conf.py.in
++++ b/vigranumpy/docsrc/conf.py.in
- @@ -239,7 +239,7 @@ for l in replace_file:
++@@ -239,7 +239,7 @@
+ .. |%s| replace:: %s
+ """% (replacement[0],replacement[0][k+1:])
+ rst_epilog += """
+- .. _%s: ../../doc/vigra/%s
++ .. _%s: /usr/share/doc/libvigraimpex-doc/html/%s
+ """% (replacement[0],replacement[1])
+
+ # make python accumulators documentation better (?)
++Index: b/vigranumpy/docsrc/index.rst
++===================================================================
+--- a/vigranumpy/docsrc/index.rst
++++ b/vigranumpy/docsrc/index.rst
- @@ -14,7 +14,7 @@ Vigranumpy Reference
++@@ -14,7 +14,7 @@
+ Introduction
+ ------------
+
+-Vigranumpy exports the functionality of the C++ image processing library `VIGRA <../vigra/index.html>`_ to Python. It can be invoked by importing the vigra module::
++Vigranumpy exports the functionality of the C++ image processing library `VIGRA </usr/share/doc/libvigraimpex-doc/html/index.html>`_ to Python. It can be invoked by importing the vigra module::
+
+ import vigra
+
- @@ -403,7 +403,7 @@ Color and Intensity Manipulation
++@@ -260,7 +260,7 @@
+
+ The module vigra.colors provides functions to adjust image brightness and contrast,
+ and to transform between different color spaces.
+-See `Color Conversions <../vigra/group__ColorConversions.html>`_ in the C++ documentation
++See `Color Conversions </usr/share/doc/libvigraimpex-doc/group__ColorConversions.html>`_ in the C++ documentation
+ for more information.
+
+ .. automodule:: vigra.colors
diff --cc debian/patches/off-by-on-in-exportImageAlpha.diff
index 0000000,0000000..c13c1d2
new file mode 100644
--- /dev/null
+++ b/debian/patches/off-by-on-in-exportImageAlpha.diff
@@@ -1,0 -1,0 +1,15 @@@
++Description: fix an off-by-one error in function exportImageAlpha
++ suggested by Andreas Metzer, fixes an exr issue in enblend
++Origin: https://github.com/ukoethe/vigra/commit/c3fb6c90ab8b4243b752919d0e491df2a2d4f047
++
++--- a/include/vigra/impexalpha.hxx
+++++ b/include/vigra/impexalpha.hxx
++@@ -789,7 +789,7 @@
++
++ encoder->setPixelType(pixel_type);
++
++- vigra_precondition(isBandNumberSupported(encoder->getFileType(), image_accessor.size(image_upper_left)),
+++ vigra_precondition(isBandNumberSupported(encoder->getFileType(), image_accessor.size(image_upper_left) + 1U),
++ "exportImageAlpha(): file format does not support requested number of bands (color channels)");
++
++ const range_t image_source_range(find_source_value_range(export_info,
diff --cc debian/patches/removed-static-docs.diff
index b8abfb0,0000000..b20f4d0
mode 100644,000000..100644
--- a/debian/patches/removed-static-docs.diff
+++ b/debian/patches/removed-static-docs.diff
@@@ -1,11 -1,0 +1,20 @@@
++Description: vigranumpy/docsrc/_static is removed in dfsg tarball,
++ link to alternative icon
++Author: Former package maintainer
++Forwarded: not-needed
++Reviewed-by: Daniel Stender <debian at danielstender.com>
++Last-Update: 2014-12-09
++
++Index: b/vigranumpy/docsrc/CMakeLists.txt
++===================================================================
+--- a/vigranumpy/docsrc/CMakeLists.txt
++++ b/vigranumpy/docsrc/CMakeLists.txt
- @@ -19,7 +19,7 @@ IF(PYTHON_SPHINX)
++@@ -19,7 +19,7 @@
+ -c ${CMAKE_CURRENT_BINARY_DIR}
+ ${SPHINX_OPTS})
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_static)
+- configure_file(_static/vigra-icon.ico ${CMAKE_CURRENT_BINARY_DIR}/_static/vigra-icon.ico COPYONLY)
++ configure_file(../../docsrc/vigra-icon.ico ${CMAKE_CURRENT_BINARY_DIR}/_static/vigra-icon.ico COPYONLY)
+
+ DEPENDENCY_PATH(VIGRAIMPEX_PATH vigraimpex)
+ STRING(REGEX REPLACE "/vigra$" "" VIGRANUMPY_TMP_PATH ${vigranumpy_tmp_dir})
diff --cc debian/patches/series
index b710a46,0000000..e53740d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,5 @@@
- disable-noise-variance-clustering-vigranumpy-test.diff
+docsrc-out-of-source.diff
+docsrc-paths.diff
+vigra-config-docdir.diff
+removed-static-docs.diff
++off-by-on-in-exportImageAlpha.diff
diff --cc debian/patches/vigra-config-docdir.diff
index 996e528,0000000..916f216
mode 100644,000000..100644
--- a/debian/patches/vigra-config-docdir.diff
+++ b/debian/patches/vigra-config-docdir.diff
@@@ -1,12 -1,0 +1,14 @@@
+Description: Correct output of ‘vigra-config --docdir’.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: not-needed
+Last-Update: 2011-01-22
++Index: b/config/vigra-config.in
++===================================================================
+--- a/config/vigra-config.in
++++ b/config/vigra-config.in
- @@ -91,4 +91,4 @@ if op.include_path: # was: --include_pat
++@@ -91,4 +91,4 @@
+ print '@CMAKE_INSTALL_PREFIX@/include'
+
+ if op.docdir:
+- print '@DOCDIR@'
++ print '/usr/share/doc/libvigraimpex-dev/html/'
diff --cc debian/rules
index a0dc675,0000000..4b93e94
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,200 -1,0 +1,220 @@@
+#!/usr/bin/make -f
+
- CFLAGS := $(shell dpkg-buildflags --get CFLAGS; dpkg-buildflags --get CPPFLAGS)
- CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS; dpkg-buildflags --get CPPFLAGS)
- LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
++CFLAGS := $(shell env DEB_CFLAGS_MAINT_APPEND=-pipe dpkg-buildflags --get CFLAGS; dpkg-buildflags --get CPPFLAGS)
++CXXFLAGS := $(shell env DEB_CXXFLAGS_MAINT_APPEND=-pipe dpkg-buildflags --get CXXFLAGS; dpkg-buildflags --get CPPFLAGS)
++LDFLAGS := $(shell env DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed dpkg-buildflags --get LDFLAGS)
+
+# These don't need to be exported and if they are we'll get the flags
+# duplicated in the command line.
+unexport CFLAGS
+unexport CXXFLAGS
+unexport LDFLAGS
+
- ifeq ($(DEB_HOST_ARCH_CPU),i386)
++DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
++
++ifeq ($(DEB_BUILD_ARCH),i386)
+ CFLAGS += -ffloat-store
+ CXXFLAGS += -ffloat-store
+endif
+
++ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))
++ CXXFLAGS += --param ggc-min-expand=20
++endif
++
++space = $() $()
++here = $(dir $(firstword $(MAKEFILE_LIST)))/..
++current_version = $(shell cd $(here) && dpkg-parsechangelog | sed -n -r -e "/Version: (.*)/ { s//\1/p; q; }")
++upstream_version = $(firstword $(subst -,$(space),$(current_version)))
++
++ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
++ export CMAKE_INCLUDE_PATH=/usr/include/hdf5/serial
++ export CMAKE_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
++endif
++
+cmake_options = \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_OPENEXR=ON \
+ -DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \
+ -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS)" \
+ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)"
+cmake_python_options = \
+ -DPYTHON_EXECUTABLE=/usr/bin/python$(1) \
+ -DPYTHON_INCLUDE_DIR=/usr/include/python$(1)/ \
+ -DPYTHON_LIBRARY=$(wildcard /usr/lib/libpython$(1).so /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(1).so) \
+ -DBoost_PYTHON_LIBRARY_RELEASE=$(wildcard /usr/lib/libboost_python-py$(subst .,,$(1)).so /usr/lib/$(DEB_HOST_MULTIARCH)/libboost_python-py$(subst .,,$(1)).so)
+
+# build and build-* targets
+# =========================
+
+.PHONY: build build-arch build-indep
+
+build: build-arch build-indep
+
+build-indep:
+ # Nothing to do in build-indep, "thanks" to bug #374029.
+
+build-arch:
+ dh_testdir
++ echo DEBUGMEMSIZE ; if which free ; then free ; fi
+ $(MAKE) -f debian/rules \
+ obj/CMakeCache.txt \
+ $(patsubst %,obj.%/CMakeCache.txt,$(shell pyversions -r))
+ $(MAKE) -f debian/rules \
+ doc/changelog \
+ obj/build-stamp \
+ $(patsubst %,obj.%/build-stamp,$(shell pyversions -r))
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+ ifneq (,$(filter $(DEB_HOST_ARCH_CPU),powerpc))
+ : # run the tests, but ignore test results
+ -$(MAKE) -k -f debian/rules \
+ obj/test-stamp \
+ $(patsubst %,obj.%/test-stamp,$(shell pyversions -r))
+ else
+ $(MAKE) -k -f debian/rules \
+ obj/test-stamp \
+ $(patsubst %,obj.%/test-stamp,$(shell pyversions -r))
+ endif
+endif
+
+obj/CMakeCache.txt:
+ mkdir -p $(dir $(@))
+ cd $(dir $(@)) && cmake .. $(cmake_options) \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
+ -DWITH_VIGRANUMPY=0
+
+obj.python%/CMakeCache.txt:
+ mkdir -p $(dir $(@))
+ cd $(dir $(@)) && \
+ CXXFLAGS=-fno-strict-aliasing cmake .. $(cmake_options) $(call cmake_python_options,$(*))
+ if ! grep VIGRANUMPY_DEPENDENCIES $(@) > /dev/null; then \
+ echo "Error: Numpy for Python $* not found" >&2; \
+ rm -f $(@); \
+ exit 1; \
+ fi
+ # We don't want to link with libpythonX.Y.
+ # We don't want SONAMES (except vigranumpycore.so)
+ find $(dir $(@))/vigranumpy/ -name 'link.txt' -exec sed -i \
+ -e 's/ -lpython[0-9.]\+ / /g' \
+ -e '/-Wl,-soname,vigranumpycore/b' \
+ -e 's/ -Wl,-soname,[^ ]\+ / /' \
+ {} +
+
+obj/build-stamp: obj/CMakeCache.txt
+ $(MAKE) -C $(dir $(@))
+ chmod a-x vigranumpy/test/*.py # nosetest would skip executable *.py
+ touch $(@)
+
+obj.python%/build-stamp: obj.python%/CMakeCache.txt obj/build-stamp
+ cd obj && find . -name '*.o' -o -name '*.so' -o -name '*.so.*' | xargs cp -v --preserve=links --parents -t ../$(dir $(@))
+ $(MAKE) -C $(dir $(@))
+ touch $(@)
+
+obj/test-stamp: obj/build-stamp
+ $(MAKE) check -C $(dir $(@))
+ touch $(@)
+
+obj.python%/test-stamp:: obj.python%/build-stamp
+ $(MAKE) vigranumpytest -C $(dir $(@))
+ touch $(@)
+
+doc/changelog: docsrc/credits_changelog.dxx
+ sh debian/convert-changelog.sh < $(<) > $(@)
+
+# binary and binary-* targets
+# ===========================
+
+.PHONY: binary binary-arch binary-indep
+
+binary: binary-arch binary-indep
+
+binary-arch: build-arch
+ dh_testdir
+ dh_testroot
+ $(MAKE) -f debian/rules \
+ obj/install-stamp \
+ $(patsubst %,obj.%/install-stamp,$(shell pyversions -r))
+ dh_install -a
+ dh_installdocs -a
+ dh_installchangelogs -a doc/changelog
+ dh_installexamples -a
+ find -path './debian/*/usr/share/doc/*/examples/*' -exec chmod a-x '{}' +
+ dh_installman -a
+ dh_python2 -a
+ dh_link -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_strip -a
+ dh_makeshlibs -V 'libvigraimpex5 (>= 1.10.0)'
+ dh_shlibdeps
+ # See <http://lists.debian.org/debian-python/2010/07/msg00042.html>:
- dh_numpy -p python-vigra
++ $(or $(wildcard /usr/bin/dh_numpy),debian/dh_numpy) -p python-vigra
+ dh_installdeb -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+.PHONY: binary-indep
+binary-indep: build-indep
+ dh_testdir
+ dh_testroot
+ $(MAKE) -f debian/rules \
+ doc/vigra/build-stamp \
+ doc/vigranumpy/build-stamp
+ dh_installdocs -i -XLICENSE.txt -Xobjects.inv -Xdoctrees -X.buildinfo -Xbuild-stamp
+ cd debian/libvigraimpex-doc/usr/share/doc/libvigraimpex-doc/ && \
+ rm -rf html && \
+ mv vigra html && \
+ rm -f html/jquery.js && \
+ sed -r -i \
+ -e 's!(<a href=")LICENSE.txt(">)!\1/usr/share/doc/libvigraimpex-doc/copyright\2!g' \
+ html/index.html
+ cd debian/python-vigra-doc/usr/share/doc/python-vigra-doc/ && \
+ rm -rf html && \
+ mv vigranumpy html
+ dh_installchangelogs -i
+ dh_link -i
+ifeq "$(wildcard /usr/bin/dh_sphinxdoc)" ""
+ echo "sphinxdoc:Depends=libjs-jquery" >> debian/python-vigra-doc.substvars
+else
+ dh_sphinxdoc -p python-vigra-doc /usr/share/doc/python-vigra-doc/html/
+endif
+ dh_compress -i -X.js -X_sources
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+%/install-stamp: %/build-stamp
+ $(MAKE) -C $(dir $(@)) install DESTDIR=$(CURDIR)/debian/tmp/
+ touch $(@)
+
+doc/vigra/build-stamp: obj/build-stamp
+ $(MAKE) doc_cpp -C obj/
+ touch $(@)
+
+doc/vigranumpy/build-stamp: obj.$(shell pyversions -d)/build-stamp doc/vigra/build-stamp
+ ln -sf $(CURDIR)/vigranumpy/docsrc/c_api_replaces.txt obj.$(shell pyversions -d)/vigranumpy/docsrc/
+ $(MAKE) doc_python -C obj.$(shell pyversions -d)/
+ touch $(@)
+
- get-orig-source:
- uscan --verbose # --repack-compression xy
-
+# clean target
+# ============
+
+.PHONY: clean
+clean:
+ dh_testdir
+ dh_clean
+ rm -rf obj*/
- if [ -d doc/ ] ; then find doc/ -type f -delete ; fi
++ find doc/ -type f -delete
+
- .NOTPARALLEL:
++# get-orig-source target
++# ======================
+
- # vim:ts=4 sw=4 noet
++.PHONY: get-orig-source
++get-orig-source:
++ sh $(here)/debian/get-orig-source.sh 1.10.0+dfsg
++ #sh $(here)/debian/get-orig-source.sh $(upstream_version)
++
++.NOTPARALLEL:
diff --cc debian/watch
index e49a437,0000000..6bd0512
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,4 @@@
+version=3
- opts=dversionmangle=s/\+dfsg[0-9]*// \
- https://github.com/ukoethe/vigra/releases .*/vigra-(\d[\d.]+)-src.*\.(?:tar(?:\.gz|\.bz2)?|tgz)
++opts=uversionmangle=s/-/./g,\
++dversionmangle=s/\+dfsg\d*$// \
++https://github.com/ukoethe/vigra/releases (?:.*/)vigra-([\d.]+)-src(?:-with-docu|).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git
More information about the debian-science-commits
mailing list