--- enblend-3.0.dfsg.1.orig/debian/changelog +++ enblend-3.0.dfsg.1/debian/changelog @@ -0,0 +1,22 @@ +enblend (3.0.dfsg.1-0ubuntu3) gutsy; urgency=low + + * A rebuild for new library depends would work much better if the + Build-Depends were actually changed. + * Really rebuild for the libglew1 -> libglew1.4 transition. + + -- Steve Kowalik Sun, 15 Jul 2007 12:04:31 +1000 + +enblend (3.0.dfsg.1-0ubuntu2) gutsy; urgency=low + + * Rebuild for the libglew1 -> libglew1.4 transition. + + -- Steve Kowalik Sat, 14 Jul 2007 23:33:27 +1000 + +enblend (3.0.dfsg.1-0ubuntu1) feisty; urgency=low + + * Initial packaging. + * Patch to build on amd64 (thanks sistpoty). + * Remove BSD+advertising-clause (not GPL compatible) src/win32helpers + + -- Toby Smithe Wed, 7 Feb 2007 19:55:32 +0000 + --- enblend-3.0.dfsg.1.orig/debian/compat +++ enblend-3.0.dfsg.1/debian/compat @@ -0,0 +1 @@ +5 --- enblend-3.0.dfsg.1.orig/debian/control +++ enblend-3.0.dfsg.1/debian/control @@ -0,0 +1,24 @@ +Source: enblend +Section: graphics +Priority: extra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Toby Smithe +Build-Depends: debhelper (>= 5), dpatch, libboost-dev, libtiff4-dev, liblcms1-dev, libglew1.4-dev, libglut3-dev, libplot-dev +Standards-Version: 3.7.2 + +Package: enblend +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Tool for compositing images + Enblend is a tool for compositing images using a Burt & Adelson multiresolution + 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. + . + http://enblend.sourceforge.net --- enblend-3.0.dfsg.1.orig/debian/copyright +++ enblend-3.0.dfsg.1/debian/copyright @@ -0,0 +1,138 @@ +This package was debianized by Hubert Figuiere on +Fri, 24 Jun 2005 00:46:06 -0400. It was them shamefully hijacked by Toby +Smithe on Wed, 7 Feb 2007 19:55:32 +0000, for +Enblend 3. + +It was downloaded from http://enblend.sourceforge.net + +Upstream Author: Andrew Mihal + +Copyright: (C) 2004-2007 Andrew Mihal + +License: + +Enblend 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. + +Enblend 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 Enblend; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +The Debian packaging is (C) 2007, Toby Smithe and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + +Enblend uses the VIGRA computer vision library. +VIGRA is Copyright 1998-2004 by Ullrich Koethe, Gunnar Kedenburg and +Cognitive Systems Group, University of Hamburg, Germany +Portions Copyright (C) 1998-2001 Pablo d'Angelo + +VIGRA licence: +(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. + + +include/vigra_ext files except those listed below :: + Copyright (C) Pablo d'Angelo + Licenced under the GPL + +include/vigra_ext/Interpolators.h :: + Copyright (C) Helmut Dersch + Copyright (C) Pablo d'Angelo (port to vigra) + +include/vigra_ext/XMIWrapper.h :: + Holds same copyright/licence as main Enblend source (see above) + +include/vigra_ext/NearestFeatureTransform.h :: + Copyright (C) 2004 Andrew Mihal + This file is part of Enblend. + Adapted to vigra & panoramic stitcher by Pablo d'Angelo + +include/vigra_ext/ransac.h :: + Originally by Ziv Yaniv + Modified by Pablo d'Angleo (see above) + +include/vigra_impex/rgbe.c :: + Copyright (C) 1995 Bruce Walter + Copyright (C) Greg Ward + + THIS CODE CARRIES NO GUARANTEE OF USABILITY OR FITNESS FOR ANY PURPOSE. + WHILE THE AUTHORS HAVE TRIED TO ENSURE THE PROGRAM WORKS CORRECTLY, + IT IS STRICTLY USE AT YOUR OWN RISK. + +src/win32helpers (NOT INCLUDED IN UPLOAD DUE TO DISAGREEMENTS WITH GPL) :: + Portions Copyright (c) 1987, 1993, 1994 + The Regents of the University of California. All rights + reserved. + Portions Copyright (c) 2003-2005, PostgreSQL Global Development + Group + BSD Licence: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its + * contributors may be used to endorse or promote products + * derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED.IN NO EVENT SHALL THE REGENTS OR + * CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + + +src/float_cast.h + Copyright (C) 2001 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. + --- enblend-3.0.dfsg.1.orig/debian/docs +++ enblend-3.0.dfsg.1/debian/docs @@ -0,0 +1,5 @@ +AUTHORS +ChangeLog +NEWS +README +TODO --- enblend-3.0.dfsg.1.orig/debian/rules +++ enblend-3.0.dfsg.1/debian/rules @@ -0,0 +1,72 @@ +#!/usr/bin/make -f +# -*- makefile -*- +CFLAGS = -Wall -g + +include /usr/share/dpatch/dpatch.make + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man + + touch configure-stamp + + +build: patch build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + # Add here commands to install the package into debian/enblend. + $(MAKE) DESTDIR=$(CURDIR)/debian/enblend install + dh_install + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- enblend-3.0.dfsg.1.orig/debian/patches/00list +++ enblend-3.0.dfsg.1/debian/patches/00list @@ -0,0 +1,2 @@ +01-anneal_identical_types_64bit.screwed +02-fix-configure --- enblend-3.0.dfsg.1.orig/debian/patches/01-anneal_identical_types_64bit.screwed.dpatch +++ enblend-3.0.dfsg.1/debian/patches/01-anneal_identical_types_64bit.screwed.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-anneal_identical_types_64bit.screwed.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad enblend-3.0~/src/anneal.h enblend-3.0/src/anneal.h +--- enblend-3.0~/src/anneal.h 2004-11-21 09:23:08.000000000 +0000 ++++ enblend-3.0/src/anneal.h 2007-02-22 20:58:39.815391977 +0000 +@@ -678,7 +678,7 @@ + + localK = stateSpace->size(); + if (localK < 2) convergedPoints[index] = true; +- kMax = std::max(kMax, stateProbabilities->size()); ++ kMax = std::max(static_cast(kMax), static_cast(stateProbabilities->size())); + + } + --- enblend-3.0.dfsg.1.orig/debian/patches/02-fix-configure.dpatch +++ enblend-3.0.dfsg.1/debian/patches/02-fix-configure.dpatch @@ -0,0 +1,67 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-fix-configure.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad enblend-3.0~/Makefile.am enblend-3.0/Makefile.am +--- enblend-3.0~/Makefile.am 2004-11-15 06:48:16.000000000 +0000 ++++ enblend-3.0/Makefile.am 2007-02-22 21:25:57.420713785 +0000 +@@ -1,2 +1,2 @@ +-EXTRA_DIST = VIGRA_LICENSE READMEWIN enblend.sln ++EXTRA_DIST = VIGRA_LICENSE enblend.sln + SUBDIRS = include doc src +diff -urNad enblend-3.0~/configure enblend-3.0/configure +--- enblend-3.0~/configure 2007-01-27 05:01:55.000000000 +0000 ++++ enblend-3.0/configure 2007-02-22 21:27:11.156915772 +0000 +@@ -7866,7 +7866,7 @@ + fi + + +- ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile include/vigra/Makefile include/vigra_ext/Makefile src/Makefile src/vigra_impex/Makefile src/win32helpers/Makefile" ++ ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile include/vigra/Makefile include/vigra_ext/Makefile src/Makefile src/vigra_impex/Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -8431,7 +8431,6 @@ + "include/vigra_ext/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/vigra_ext/Makefile" ;; + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/vigra_impex/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/vigra_impex/Makefile" ;; +- "src/win32helpers/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/win32helpers/Makefile" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +diff -urNad enblend-3.0~/configure.in enblend-3.0/configure.in +--- enblend-3.0~/configure.in 2007-01-27 04:54:39.000000000 +0000 ++++ enblend-3.0/configure.in 2007-02-22 21:27:23.805636582 +0000 +@@ -69,6 +69,5 @@ + include/vigra/Makefile + include/vigra_ext/Makefile + src/Makefile +- src/vigra_impex/Makefile +- src/win32helpers/Makefile]) ++ src/vigra_impex/Makefile]) + AC_OUTPUT +diff -urNad enblend-3.0~/src/Makefile.am enblend-3.0/src/Makefile.am +--- enblend-3.0~/src/Makefile.am 2007-01-28 01:24:51.000000000 +0000 ++++ enblend-3.0/src/Makefile.am 2007-02-22 21:25:57.420713785 +0000 +@@ -1,5 +1,5 @@ + EXTRA_DIST = enblend.vcproj +-SUBDIRS = vigra_impex win32helpers ++SUBDIRS = vigra_impex + bin_PROGRAMS = enblend + 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 = -DENBLEND_CACHE_IMAGES -ffast-math +diff -urNad enblend-3.0~/src/Makefile.in enblend-3.0/src/Makefile.in +--- enblend-3.0~/src/Makefile.in 2007-01-28 01:24:56.000000000 +0000 ++++ enblend-3.0/src/Makefile.in 2007-02-22 21:25:57.420713785 +0000 +@@ -158,7 +158,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + EXTRA_DIST = enblend.vcproj +-SUBDIRS = vigra_impex win32helpers ++SUBDIRS = vigra_impex + 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 = -DENBLEND_CACHE_IMAGES -ffast-math + #enblend_LDADD = vigra_impex/libvigra_impex.a -lpng -ljpeg -ltiff