From 2e475da378ebbbf49871e05d895c891ba0c8a670 Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 20 Dec 2009 14:55:34 +0100 Subject: [PATCH] Update debian/patches-repack/* for 4.0. --- debian/changelog | 9 ++ debian/patches-repack/00-win32helpers.patch | 105 +++--------------- .../patches-repack/01-unnecessary-libs.patch | 29 +++-- .../patches-repack/03-addmissingVERSION.patch | 5 + 4 files changed, 43 insertions(+), 105 deletions(-) create mode 100644 debian/patches-repack/03-addmissingVERSION.patch diff --git a/debian/changelog b/debian/changelog index 20a2764..98e9c9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +enblend-enfuse (4.0+dfsg-1) experimental; urgency=low + + * New upstream version. + * Update debian/patches-repack/*. + * debian/patches-repack/03-addmissingVERSION.patch Add file missing in the + tarball but present in HG. + + -- Andreas Metzler Sun, 20 Dec 2009 14:12:21 +0100 + enblend-enfuse (3.2+dfsg-3) unstable; urgency=medium * Remove usr/share/info/dir, which GNU install-info generates. diff --git a/debian/patches-repack/00-win32helpers.patch b/debian/patches-repack/00-win32helpers.patch index 2466925..3713bf7 100644 --- a/debian/patches-repack/00-win32helpers.patch +++ b/debian/patches-repack/00-win32helpers.patch @@ -1,98 +1,23 @@ -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 +diff -NurbBp a/configure.in b/configure.in +--- a/configure.in 2009-12-05 08:26:45.000000000 +0100 ++++ b/configure.in 2009-12-20 14:17:56.000000000 +0100 +@@ -524,7 +524,6 @@ AC_CONFIG_FILES([Makefile include/vigra_ext/Makefile src/Makefile -- src/vigra_impex/Makefile -- src/win32helpers/Makefile]) -+ src/vigra_impex/Makefile]) + src/vigra_impex/Makefile +- src/win32helpers/Makefile + doc/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 +diff -NurbBp a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am 2009-12-02 08:27:29.000000000 +0100 ++++ b/src/Makefile.am 2009-12-20 14:18:42.000000000 +0100 +@@ -3,7 +3,7 @@ AM_CFLAGS = $(EXTRACFLAGS) + AM_CXXFLAGS = $(EXTRACXXFLAGS) + AM_LDFLAGS = $(EXTRALDFLAGS) + -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 + bin_PROGRAMS = enblend enfuse - 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 diff --git a/debian/patches-repack/01-unnecessary-libs.patch b/debian/patches-repack/01-unnecessary-libs.patch index c27fcb0..fb5c32f 100644 --- a/debian/patches-repack/01-unnecessary-libs.patch +++ b/debian/patches-repack/01-unnecessary-libs.patch @@ -1,17 +1,16 @@ -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} +diff -NurbBp a/m4/ax_check_glut.m4 b/m4/ax_check_glut.m4 +--- a/m4/ax_check_glut.m4 2009-09-06 15:14:31.000000000 +0200 ++++ b/m4/ax_check_glut.m4 2009-12-20 14:23:34.000000000 +0100 +@@ -72,12 +72,6 @@ m4_define([AX_CHECK_GLUT_PROGRAM], + # endif]], + [[glutMainLoop()]])]) -- # -- # 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 +-# +-# If X is present, assume GLUT depends on it. +-# +-AS_IF([test X$no_x != Xyes], +- [GLUT_LIBS="${X_PRE_LIBS} -lXmu -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}"]) - - AC_LANG_PUSH(C) - - ax_save_CPPFLAGS="${CPPFLAGS}" + AC_CACHE_CHECK([for GLUT library], [ax_cv_check_glut_libglut], + [ax_cv_check_glut_libglut="no" + AC_LANG_PUSH(C) diff --git a/debian/patches-repack/03-addmissingVERSION.patch b/debian/patches-repack/03-addmissingVERSION.patch new file mode 100644 index 0000000..97b2352 --- /dev/null +++ b/debian/patches-repack/03-addmissingVERSION.patch @@ -0,0 +1,5 @@ +diff -NurbBp a/VERSION b/VERSION +--- a/VERSION 1970-01-01 01:00:00.000000000 +0100 ++++ b/VERSION 2009-12-20 14:36:54.000000000 +0100 +@@ -0,0 +1 @@ ++4.0-753b534c819d -- 2.30.2