--- enblend-enfuse-3.2+dfsg.orig/debian/compat +++ enblend-enfuse-3.2+dfsg/debian/compat @@ -0,0 +1 @@ +5 --- enblend-enfuse-3.2+dfsg.orig/debian/enblend.install +++ enblend-enfuse-3.2+dfsg/debian/enblend.install @@ -0,0 +1,4 @@ +usr/bin/enblend +usr/share/info/enblend.info +usr/share/man/man1/enblend.1 + --- enblend-enfuse-3.2+dfsg.orig/debian/watch +++ enblend-enfuse-3.2+dfsg/debian/watch @@ -0,0 +1,6 @@ +version=3 + +opts=dversionmangle=s/\+dfsg$// \ +http://sf.net/enblend/enblend(?:-enfuse)?-([0-9.]+)\.tar\.gz \ + debian debian/bin/uscan_repack.sh + --- enblend-enfuse-3.2+dfsg.orig/debian/control +++ enblend-enfuse-3.2+dfsg/debian/control @@ -0,0 +1,58 @@ +Source: enblend-enfuse +Section: graphics +Priority: optional +Maintainer: Debian PhotoTools Maintainers +Uploaders: Sebastian Harl +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, autotools-dev, libtiff4-dev, libboost-dev, liblcms1-dev, libglew1.5-dev | libglew1.4-dev | libglew-dev, freeglut3-dev, libplot-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libopenexr-dev, pkg-config, texinfo +Standards-Version: 3.8.1 +Homepage: http://enblend.sourceforge.net/ +Vcs-Git: git://git.debian.org/git/pkg-phototools/enblend.git +Vcs-Browser: http://git.debian.org/?p=pkg-phototools/enblend.git + +Package: enblend +Architecture: any +Depends: ${shlibs:Depends} +Recommends: hugin +Enhances: hugin +Description: image blending tool + Enblend is a tool for compositing images. Given a set of images that overlap + in some irregular way, Enblend overlays them in such a way that the seam + between the images is invisible, or at least very difficult to see. It can, + for example, be used to blend a panorama composed of several images. + . + It uses a Burt & Adelson multi-resolution spline. This technique tries to + make the seams between the input images invisible. The basic idea is that + image features should be blended across a transition zone proportional in + size to the spatial frequency of the features. For example, objects like + trees and windowpanes have rapid changes in color. By blending these + features in a narrow zone, you will not be able to see the seam because the + eye already expects to see color changes at the edge of these features. + Clouds and sky are the opposite. These features have to be blended across a + wide transition zone because any sudden change in color will be immediately + noticeable. + . + Enblend 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 Enblend is + designed to work with. + +Package: enfuse +Architecture: any +Depends: ${shlibs:Depends} +Recommends: hugin +Enhances: hugin +Description: image exposure blending tool + Enfuse blends differently exposed images of the same scene into a nice output + image, without producing intermediate HDR images that are then tonemapped to a + viewable image. This simplified process often works much better and quicker + than the currently known tonemapping algorithms. + . + The exposure blending is done using the Mertens-Kautz-Van Reeth exposure + fusion algorithm. The basic idea is that pixels in the input images are + weighted according to qualities such as proper exposure, good contrast, and + high saturation. These weights determine how much a given pixel will + contribute to the final image. + . + 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. + --- enblend-enfuse-3.2+dfsg.orig/debian/copyright +++ enblend-enfuse-3.2+dfsg/debian/copyright @@ -0,0 +1,245 @@ +This package was debianized by Sebastian Harl on +Sun, 28 Oct 2007 18:25:17 +0100. + +It was downloaded from . + +Upstream Author: + Andrew Mihal + +Copyright Holders (in alphabetical order): + Andrew Mihal + Braden McDaniel + Bruce Walter + Christian-Dennis Rahn + Dr. Christoph L. Spiel + Erik de Castro Lopo + Free Software Foundation, Inc. + Gunnar Kedenburg + Hans Meine + Helmut Dersch + Pablo d'Angelo + Paul Moore + Steven G. Johnson + Tom Lane + Ullrich Koethe + Ziv Yaniv + +License: + + File doc/texinfo.tex + Copyright © 1985-2006 Free Software Foundation, Inc. + + File include/vigra_ext/Interpolators.h + Copyright © Helmut Dersch + Copyright © Pablo d'Angelo + + Files include/vigra_ext/NearestFeatureTransform.h + include/vigra_ext/XMIWrapper.h + Copyright © 2004-2005 Andrew Mihal + + Files include/vigra_ext/ransac.h + include/vigra_ext/RansacParameterEstimator.h + Copyright © Ziv Yaniv + + All other files in include/vigra_ext/ + Copyright © Pablo d'Angelo + + File src/float_cast.h + Copyright © 2001 Erik de Castro Lopo + + All other files (except doc/*.{info,texi}, include/vigra/*, m4/*, + src/float_cast.h and src/vigra_impex/*) + Copyright © 2004-2007 Andrew Mihal + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + + File m4/acx_pthread.m4 + Copyright © 2006 Steven G. Johnson + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + + As a special exception, the respective Autoconf Macro's copyright + owner gives unlimited permission to copy, distribute and modify the + configure scripts that are the output of Autoconf when processing + the Macro. You need not follow the terms of the GNU General Public + License when using or distributing such scripts, even though + portions of the text of the Macro appear in them. The GNU General + Public License (GPL) does govern all other use of the material that + constitutes the Autoconf Macro. + + This special exception to the GPL applies to versions of the + Autoconf Macro released by the Autoconf Macro Archive. When you + make and distribute a modified version of the Autoconf Macro, you + may extend this special exception to the GPL to apply to your + modified version as well. + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL'. + + Files doc/enblend.info + doc/enblend.texi + doc/enfuse.info + doc/enfuse.texi + Copyright © 2004-2008 Andrew Mihal + + Files doc/enfuse-focus-stacking.info + doc/enfuse-focus-stacking.texi + Copyright © 2008 Dr. Christoph L. Spiel + (license clarified on the hugin-ptx list - see + http://groups.google.com/group/hugin-ptx/browse_thread/thread/ae7a2281cec99981) + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. + +On Debian systems, the complete text of the GNU Free Documentation License +can be found in `/usr/share/common-licenses/GFDL'. + + Files include/vigra/cachedfileimage.hxx + include/vigra/stdcachedfileimage.hxx + Copyright © 2004 Andrew Mihal + + Files include/vigra/codec.hxx + include/vigra/impex.hxx + include/vigra/multi_array.hxx + include/vigra/multi_impex.hxx + include/vigra/multi_iterator.hxx + Copyright © 2001-2002 Gunnar Kedenburg + + File include/vigra/diff2d.hxx + Copyright © 1998-2003 Hans Meine + + Files include/vigra/gaborfilter.hxx + include/vigra/memory.hxx + include/vigra/pixelneighborhood.hxx + include/vigra/seededregiongrowing.hxx + Copyright © 1998-2005 Ullrich Koethe + Copyright © 1998-2005 Hans Meine + + Files include/vigra/imageinfo.hxx + include/vigra/linear_solve.hxx + include/vigra/matrix.hxx + Copyright © 1998-2001 Ullrich Koethe + Copyright © 2001-2002 Gunnar Kedenburg + + File include/vigra/multi_convolution.hxx + Copyright © 2003 Christian-Dennis Rahn + Copyright © 2003 Ullrich Koethe + + File include/vigra/rational.hxx + Copyright 1998-2004 by Ullrich Koethe + this file is based on work by Paul Moore: + Copyright Paul Moore 1999. + + All other files in include/vigra/ + Copyright © 1998-2006 Ullrich Koethe + + Files src/vigra_impex/byteorder.cxx + src/vigra_impex/error.hxx + Copyright © 2002-2004 Ullrich Koethe + Copyright © 2002-2004 Gunnar Kedenburg + + Files src/vigra_impex/exr.cxx + src/vigra_impex/exr.hxx + src/vigra_impex/hdr.cxx + src/vigra_impex/hdr.hxx + Copyright © 1998-2007 Pablo d'Angelo + + Files src/vigra_impex/gif.cxx + src/vigra_impex/gif.hxx + Copyright © 2002 Ullrich Koethe + + Files src/vigra_impex/iccjpeg.c + src/vigra_impex/iccjpeg.h + Copyright © Tom Lane + + All other files in src/vigra_impex/ + Copyright © 1998-2004 Gunnar Kedenburg + + (the VIGRA license - identical to the MIT X11 license) + + 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. + + Files ax_check_gl.m4 + ax_check_glu.m4 + ax_check_glut.m4 + Copyright © 2004 Braden McDaniel + + (The license of these files has been clarified by Braden McDaniel during a + private E-mail conversation.) + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved + + Files m4/lrint.m4 + m4/lrintf.m4 + 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 + and this permission notice appear in all copies. No representations are + made about the suitability of this software for any purpose. It is + provided "as is" without express or implied warranty. + + Files src/vigra_impex/rgbe.c + src/vigra_impex/rgbe.h + Copyright © 1995 Bruce Walter + + (The license of these files has been clarified by Bruce Walter during a + private E-mail conversation.) + + These files are public domain. + +The Debian packaging is © 2007, Sebastian Harl and +is licensed under the GPL, see above. + --- enblend-enfuse-3.2+dfsg.orig/debian/changelog +++ enblend-enfuse-3.2+dfsg/debian/changelog @@ -0,0 +1,82 @@ +enblend-enfuse (3.2+dfsg-2~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + + -- Andreas Metzler Sun, 19 Apr 2009 14:08:16 +0200 + +enblend-enfuse (3.2+dfsg-2) unstable; urgency=low + + * Upload to unstable - Lenny has been released. + * debian/control: + - Updated standards-version to 3.8.1 - no changes. + + -- Sebastian Harl Mon, 06 Apr 2009 17:29:29 +0200 + +enblend-enfuse (3.2+dfsg-1) experimental; urgency=low + + * New upstream release (Closes: #491370). + + [ Andreas Metzler ] + * Uploading to experimental because of the Lenny freeze. + * debian/control: + - Added zlib1g-dev, libjpeg62-dev, libpng12-dev to the build dependencies, + although they currently would be pulled in by other build-depends. + - Added libopenexr-dev and pkg-config to the build dependencies. + - Updated package description to mention enfuse and the buzz-word + "exposure blending". + - Added texinfo to build-depends. + * debian/patches: + - Added addinfosection.dpatch - add @dircategory to the texinfo sources + to get an entry in the main info directory. + * debian/rules: + - Run dh_installinfo. + + [ Sebastian Harl ] + * Thanks a lot to Andreas for his help! + * debian/rules: + - Include AUTHORS file in the package as well. + - Added get-orig-source target which uses uscan to download and repack the + upstream tarball using debian/bin/uscan_repack.sh - thanks to Bernd + Zeimetz for the idea! + - Remove rebuilt documentation files. + - Use dh_install. + * debian/patches: + - Removed gcc4.3-includes.dpatch - included upstream. + - Removed type_mismatch.dpatch - included upstream. + * debian/patches-repack: + - Added patches to be applied when repacking the tarball. + - Added 00-win32helpers.patch to remove src/win32helpers/, *.sln and + *.vcproj from the build scripts. + - Added 01-unnecessary-libs.patch to remove unnecessary libs from the + linker flags - based on a patch by Andreas. + * debian/control: + - Updated standards-version to 3.8.0 - no changes. + - Renamed the source package to "enblend-enfuse" - just like upstream did. + - Added new binary package "enfuse". + * debian/bin/uscan_repack.sh: + - Added script to take care of the repacking. + - Remove src/win32helpers/. + - Remove *.sln and *.vcproj. + - Apply patches in debian/patches-repack/. + - Regenerate autotools build system. + * debian/watch: + - Call debian/bin/uscan_repack.sh. + + -- Sebastian Harl Sun, 12 Oct 2008 20:33:27 +0200 + +enblend (3.0+dfsg-2) unstable; urgency=low + + * Added libglew1.5-dev to the build dependencies to ease the libglew1.4 -> + libglew1.5 transition and make sbuild happy (Closes: #465620). + + -- Sebastian Harl Wed, 13 Feb 2008 22:03:26 +0100 + +enblend (3.0+dfsg-1) unstable; urgency=low + + * Initial release (Closes: #294389, #390655). + * Removed GPL incompatible src/win32helpers/ from .orig.tar.gz. + * Added type_mismatch.dpatch to fix a failure to instantiate std::max(). + * Added gcc4.3-includes.dpatch to add missing includes required by gcc-4.3. + + -- Sebastian Harl Fri, 28 Dec 2007 02:46:07 +0100 + --- enblend-enfuse-3.2+dfsg.orig/debian/rules +++ enblend-enfuse-3.2+dfsg/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f +# debian/rules for enblend-enfuse +# +# Written by Sebastian Harl . + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +include /usr/share/dpatch/dpatch.make + +get-orig-source: + dh_testdir + dh_testroot + chmod 755 debian/bin/uscan_repack.sh + uscan --verbose --force-download --rename + +config.status: configure $(DPATCH_STAMPFN) + dh_testdir + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --mandir=\$${prefix}/share/man + +build: build-stamp + +build-stamp: config.status + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + rm -f doc/*.info + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + +binary-indep: + # nothing to do here + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs NEWS TODO AUTHORS + dh_installexamples + dh_install --sourcedir=debian/tmp --fail-missing + dh_installman + dh_installinfo -penblend doc/enblend.info + dh_installinfo -penfuse doc/enfuse*.info + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: get-orig-source build clean binary-indep binary-arch binary install + --- enblend-enfuse-3.2+dfsg.orig/debian/enfuse.install +++ enblend-enfuse-3.2+dfsg/debian/enfuse.install @@ -0,0 +1,5 @@ +usr/bin/enfuse +usr/share/info/enfuse-focus-stacking.info +usr/share/info/enfuse.info +usr/share/man/man1/enfuse.1 + --- enblend-enfuse-3.2+dfsg.orig/debian/patches/addinfosection.dpatch +++ enblend-enfuse-3.2+dfsg/debian/patches/addinfosection.dpatch @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## addinfosection.dpatch by Andreas Metzler +## +## DP: Add dircategory to the texinfo sources to get a entry in the main info +## DP: directory. Lintian info-document-missing-dir-section. + +@DPATCH@ +--- a/doc/enblend.texi 2008-07-13 04:18:00.000000000 +0200 ++++ b/doc/enblend.texi 2008-10-05 13:27:39.000000000 +0200 +@@ -17,6 +17,7 @@ + @end ifinfo + + ++@dircategory Graphics + @c + @c Title Page and Copyright + @c +--- a/doc/enfuse.texi 2008-07-13 04:18:16.000000000 +0200 ++++ b/doc/enfuse.texi 2008-10-05 13:27:32.000000000 +0200 +@@ -17,6 +17,7 @@ + @end ifinfo + + ++@dircategory Graphics + @c + @c Title Page and Copyright + @c +--- a/doc/enfuse-focus-stacking.texi 2008-07-08 04:27:08.000000000 +0200 ++++ b/doc/enfuse-focus-stacking.texi 2008-10-05 13:27:26.000000000 +0200 +@@ -17,6 +17,10 @@ + @end ifinfo + + ++@dircategory Graphics ++@direntry ++* Focus Stacking: (enfuse-focus-stacking). Generate focus-stacks with enfuse. ++@end direntry + @c + @c Title Page and Copyright + @c + --- enblend-enfuse-3.2+dfsg.orig/debian/patches/00list +++ enblend-enfuse-3.2+dfsg/debian/patches/00list @@ -0,0 +1,2 @@ +addinfosection.dpatch + --- enblend-enfuse-3.2+dfsg.orig/debian/bin/uscan_repack.sh +++ enblend-enfuse-3.2+dfsg/debian/bin/uscan_repack.sh @@ -0,0 +1,40 @@ +#! /bin/sh +# +# This script is called as: +# $0 --upstream-version + +echo +set -ex + +test $# -eq 3 || exit 255 + +version="$2" +filename="$3" + +toplevel_sourcedir=`tar ztf ${filename} | head -n 1 | sed -e 's,/.*,,g'` + +tar zxf ${filename} +rm -f ${filename} + +mv $toplevel_sourcedir $toplevel_sourcedir+dfsg + +rm -rf $toplevel_sourcedir+dfsg/src/win32helpers +find $toplevel_sourcedir+dfsg -name '*.vcproj' -o -name '*.sln' | xargs rm -f + +for patch in debian/patches-repack/*.patch; do + ( cd $toplevel_sourcedir+dfsg; patch -p1 ) < $patch +done + +( + cd $toplevel_sourcedir+dfsg + aclocal -I m4 + autoheader -f + automake -acf + autoconf + rm -rf autom4te.cache/ config.h.in~ +) + +tar cf - $toplevel_sourcedir+dfsg | gzip -9 \ + > ../enblend-enfuse_$version+dfsg.orig.tar.gz +rm -rf $toplevel_sourcedir+dfsg + --- enblend-enfuse-3.2+dfsg.orig/debian/patches-repack/00-win32helpers.patch +++ enblend-enfuse-3.2+dfsg/debian/patches-repack/00-win32helpers.patch @@ -0,0 +1,98 @@ +diff a/Makefile.am b/Makefile.am +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,2 +1,2 @@ +-EXTRA_DIST = VIGRA_LICENSE README_WINDOWS.txt enblend.sln enblend_msvc2003.sln enblend_msvc2008.sln ++EXTRA_DIST = VIGRA_LICENSE README_WINDOWS.txt + SUBDIRS = include doc src +diff a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -140,8 +140,7 @@ + include/vigra/Makefile + include/vigra_ext/Makefile + src/Makefile +- src/vigra_impex/Makefile +- src/win32helpers/Makefile]) ++ src/vigra_impex/Makefile]) + AC_OUTPUT + + AC_MSG_RESULT([ +diff a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,5 +1,4 @@ +-EXTRA_DIST = enblend.vcproj enblend_msvc2003.vcproj enblend_msvc2008.vcproj enfuse.vcproj enfuse_msvc2003.vcproj enfuse_msvc2008.vcproj +-SUBDIRS = vigra_impex win32helpers ++SUBDIRS = vigra_impex + bin_PROGRAMS = enblend enfuse + enblend_SOURCES = anneal.h assemble.h blend.h bounds.h common.h enblend.h enblend.cc fixmath.h float_cast.h gpu.cc gpu.h mask.h nearest.h numerictraits.h path.h pyramid.h + enblend_LDFLAGS = -ffast-math +diff a/src/enblend.cc b/src/enblend.cc +--- a/src/enblend.cc ++++ b/src/enblend.cc +@@ -21,11 +21,6 @@ + #include + #endif + +-#ifdef _MSC_VER +-#include +-#define isnan _isnan +-#endif // _MSC_VER +- + // Defines lrint for fast fromRealPromotes + #include "float_cast.h" + +@@ -49,14 +44,7 @@ + #include + #include + +-#ifndef _WIN32 + #include +-#else +-//extern "C" int getopt(int nargc, char** nargv, char* ostr); +-extern "C" { +-#include +-} +-#endif + + extern "C" char *optarg; + extern "C" int optind; +diff a/src/enfuse.cc b/src/enfuse.cc +--- a/src/enfuse.cc ++++ b/src/enfuse.cc +@@ -21,11 +21,6 @@ + #include + #endif + +-#ifdef _MSC_VER +-#include +-#define isnan _isnan +-#endif // _MSC_VER +- + // Defines lrint for fast fromRealPromotes + #include "float_cast.h" + +@@ -49,14 +44,7 @@ + #include + #include + +-#ifndef _WIN32 + #include +-#else +-//extern "C" int getopt(int nargc, char** nargv, char* ostr); +-extern "C" { +-#include +-} +-#endif + + extern "C" char *optarg; + extern "C" int optind; +diff a/src/vigra_impex/Makefile.am b/src/vigra_impex/Makefile.am +--- a/src/vigra_impex/Makefile.am ++++ b/src/vigra_impex/Makefile.am +@@ -1,4 +1,3 @@ +-EXTRA_DIST = vigra_impex.vcproj vigra_impex_msvc2003.vcproj vigra_impex_msvc2008.vcproj + noinst_LIBRARIES = libvigra_impex.a + libvigra_impex_a_SOURCES = auto_file.hxx bmp.cxx bmp.hxx byteorder.cxx byteorder.hxx codecmanager.cxx codecmanager.hxx error.hxx gif.cxx gif.hxx hdr.cxx hdr.hxx iccjpeg.c iccjpeg.h imageinfo.cxx jpeg.cxx jpeg.hxx png.cxx png.hxx pnm.cxx pnm.hxx rgbe.c rgbe.h sun.cxx sun.hxx tiff.cxx tiff.hxx viff.cxx viff.hxx void_vector.cxx void_vector.hxx exr.cxx exr.hxx + #libvigra_impex_a_CXXFLAGS = -I${top_srcdir}/include -O3 -Wall -DHasPNG -DHasJPEG -DHasTIFF --- enblend-enfuse-3.2+dfsg.orig/debian/patches-repack/01-unnecessary-libs.patch +++ enblend-enfuse-3.2+dfsg/debian/patches-repack/01-unnecessary-libs.patch @@ -0,0 +1,17 @@ +diff a/m4/ax_check_glut.m4 b/m4/ax_check_glut.m4 +--- a/m4/ax_check_glut.m4 ++++ b/m4/ax_check_glut.m4 +@@ -25,13 +25,6 @@ + GLUT_CFLAGS=${GLU_CFLAGS} + GLUT_LIBS=${GLU_LIBS} + +- # +- # If X is present, assume GLUT depends on it. +- # +- if test "X${no_x}" != "Xyes"; then +- GLUT_LIBS="${X_PRE_LIBS} -lXmu -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}" +- fi +- + AC_LANG_PUSH(C) + + ax_save_CPPFLAGS="${CPPFLAGS}"