diff -Nru gimp-plugin-registry-5.20120621/debian/changelog gimp-plugin-registry-5.20120621+rpi3/debian/changelog --- gimp-plugin-registry-5.20120621/debian/changelog 2012-06-21 20:55:54.000000000 +0000 +++ gimp-plugin-registry-5.20120621+rpi3/debian/changelog 2014-03-27 19:03:25.000000000 +0000 @@ -1,3 +1,33 @@ +gimp-plugin-registry (5.20120621+rpi3) jessie-staging; urgency=medium + + * Build and version for Raspbian. + + -- Peter Michael Green Thu, 27 Mar 2014 19:03:05 +0000 + +gimp-plugin-registry (5.20120621ubuntu3) trusty; urgency=low + + * Fix FTBFS, use any automake/aclocal. + + -- Dimitri John Ledkov Fri, 03 Jan 2014 06:22:54 +0000 + +gimp-plugin-registry (5.20120621ubuntu2) raring; urgency=low + + * ld-no-add-needed.patch: link files with needed libm + + -- Julian Taylor Thu, 04 Apr 2013 23:33:44 +0200 + +gimp-plugin-registry (5.20120621ubuntu1) quantal; urgency=low + + * Build-depend on libtiff-dev rather than libtiff4-dev. + + -- Colin Watson Mon, 10 Sep 2012 11:43:02 +0100 + +gimp-plugin-registry (5.20120621build1) quantal; urgency=low + + * Rebuild for libglew1.8. + + -- Colin Watson Mon, 03 Sep 2012 15:05:36 +0100 + gimp-plugin-registry (5.20120621) unstable; urgency=low * [83567039] Add patch to avoid calling deprecated g_thread_init. diff -Nru gimp-plugin-registry-5.20120621/debian/control gimp-plugin-registry-5.20120621+rpi3/debian/control --- gimp-plugin-registry-5.20120621/debian/control 2012-06-21 20:55:54.000000000 +0000 +++ gimp-plugin-registry-5.20120621+rpi3/debian/control 2013-04-04 21:59:35.000000000 +0000 @@ -1,11 +1,12 @@ Source: gimp-plugin-registry Section: graphics Priority: optional -Maintainer: Bernd Zeimetz +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Bernd Zeimetz Build-Depends: debhelper (>= 5), autotools-dev, quilt, libgimp2.0-dev (>= 2.6), libxml-parser-perl, libblas-dev, liblapack-dev, libf2c2-dev, libfftw3-dev, libglew-dev, - libgtkglext1-dev, liblcms1-dev, libtiff4-dev, + libgtkglext1-dev, liblcms1-dev, libtiff-dev, liblqr-1-0-dev (>= 0.3.0), intltool, libxcursor-dev, python, automake, autoconf, libglib2.0-dev Standards-Version: 3.9.0 diff -Nru gimp-plugin-registry-5.20120621/debian/control.in gimp-plugin-registry-5.20120621+rpi3/debian/control.in --- gimp-plugin-registry-5.20120621/debian/control.in 2012-06-21 20:55:54.000000000 +0000 +++ gimp-plugin-registry-5.20120621+rpi3/debian/control.in 2013-04-04 21:59:35.000000000 +0000 @@ -1,11 +1,12 @@ Source: gimp-plugin-registry Section: graphics Priority: optional -Maintainer: Bernd Zeimetz +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Bernd Zeimetz Build-Depends: debhelper (>= 5), autotools-dev, quilt, libgimp2.0-dev (>= 2.6), libxml-parser-perl, libblas-dev, liblapack-dev, libf2c2-dev, libfftw3-dev, libglew-dev, - libgtkglext1-dev, liblcms1-dev, libtiff4-dev, + libgtkglext1-dev, liblcms1-dev, libtiff-dev, liblqr-1-0-dev (>= 0.3.0), intltool, libxcursor-dev, python, automake, autoconf, libglib2.0-dev Standards-Version: 3.9.0 diff -Nru gimp-plugin-registry-5.20120621/debian/patches/ld-no-add-needed.patch gimp-plugin-registry-5.20120621+rpi3/debian/patches/ld-no-add-needed.patch --- gimp-plugin-registry-5.20120621/debian/patches/ld-no-add-needed.patch 1970-01-01 00:00:00.000000000 +0000 +++ gimp-plugin-registry-5.20120621+rpi3/debian/patches/ld-no-add-needed.patch 2013-04-04 22:06:48.000000000 +0000 @@ -0,0 +1,69 @@ +Description: link plugins with the needed libm + required by ld --no-add-needed +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704713 +--- a/focus-blur/src/src/Makefile.am ++++ b/focus-blur/src/src/Makefile.am +@@ -59,7 +59,8 @@ INCLUDES = \ + LDADD = \ + $(GTHREAD_LIBS) \ + $(GIMP_LIBS) \ +- $(FFTW3_LIBS) ++ $(FFTW3_LIBS) \ ++ -lm + + focusblurstock.$(OBJEXT): $(top_srcdir)/pixmaps/pixbufs.h + $(top_srcdir)/pixmaps/pixbufs.h: +--- a/focus-blur/src/src/Makefile.in ++++ b/focus-blur/src/src/Makefile.in +@@ -228,7 +228,8 @@ INCLUDES = \ + LDADD = \ + $(GTHREAD_LIBS) \ + $(GIMP_LIBS) \ +- $(FFTW3_LIBS) ++ $(FFTW3_LIBS) \ ++ -lm + + all: all-am + +--- a/common.mk ++++ b/common.mk +@@ -1,7 +1,7 @@ + GIMPTOOL = /usr/bin/gimptool-2.0 + + %: %.c +- CFLAGS="$(CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(LFGLAGS) $(EXTRA_LDFLAGS)" $(GIMPTOOL) --build $< ++ CFLAGS="$(CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(LDFLAGS) $(EXTRA_LDFLAGS)" LIBS="$(LIBS) -lm" $(GIMPTOOL) --build $< + + build: $(PLUGIN) + +--- a/separate+/separate+/Makefile ++++ b/separate+/separate+/Makefile +@@ -37,7 +37,7 @@ CM = -DENABLE_COLOR_MANAGEMENT + NLS = -DENABLE_NLS -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" + SEP_CFLAGS += $(GIMP_INCLUDE) $(GTK_INCLUDE) $(LCMS_INCLUDE) $(CM) $(NLS) \ + -DUSE_ICC_BUTTON +-LIBS = $(GIMP_LIB) $(GTK_LIB) $(LCMS_LIB) $(TIFF_LIB) $(JPEG_LIB) ++LIBS = $(GIMP_LIB) $(GTK_LIB) $(LCMS_LIB) $(TIFF_LIB) $(JPEG_LIB) -lm + + SOURCES = $(SEPARATE_SOURCES) $(IMPORT_SOURCES) \ + $(ICC_COLORSPACE_SOURCES) $(EXTRA_SOURCES) +--- a/wavelet-denoise/wavelet-denoise-0.3.1/src/Makefile ++++ b/wavelet-denoise/wavelet-denoise-0.3.1/src/Makefile +@@ -1,5 +1,5 @@ + CFLAGS = -O3 -Wall $(shell gimptool-2.0 --cflags) +-LIBS = $(shell gimptool-2.0 --libs) ++LIBS = $(shell gimptool-2.0 --libs) -lm + PLUGIN = wavelet-denoise + SOURCES = plugin.c colorspace.c denoise.c wavelet.c events.c interface.c + HEADERS = plugin.h interface.h messages.h +--- a/normalmap/gimp-normalmap-1.2.2/Makefile.linux ++++ b/normalmap/gimp-normalmap-1.2.2/Makefile.linux +@@ -11,7 +11,7 @@ TARGET=normalmap + OBJS=normalmap.o preview3d.o scale.o + + LIBS=`pkg-config --libs gtk+-2.0 gtkglext-1.0 gimp-2.0 gimpui-2.0` \ +--L/usr/X11R6/lib -lGLEW ++-L/usr/X11R6/lib -lGLEW -lm + + all: $(TARGET) + diff -Nru gimp-plugin-registry-5.20120621/debian/patches/series gimp-plugin-registry-5.20120621+rpi3/debian/patches/series --- gimp-plugin-registry-5.20120621/debian/patches/series 2012-06-21 20:55:54.000000000 +0000 +++ gimp-plugin-registry-5.20120621+rpi3/debian/patches/series 2013-04-04 21:33:33.000000000 +0000 @@ -13,3 +13,4 @@ refocus_lapack.diff refocus_fix_warnings.diff gcc4.3-fixes.diff +ld-no-add-needed.patch diff -Nru gimp-plugin-registry-5.20120621/resynthesizer/bootchk-resynthesizer-28cade5/autogen.sh gimp-plugin-registry-5.20120621+rpi3/resynthesizer/bootchk-resynthesizer-28cade5/autogen.sh --- gimp-plugin-registry-5.20120621/resynthesizer/bootchk-resynthesizer-28cade5/autogen.sh 2012-06-21 20:55:54.000000000 +0000 +++ gimp-plugin-registry-5.20120621+rpi3/resynthesizer/bootchk-resynthesizer-28cade5/autogen.sh 2014-01-03 06:21:57.000000000 +0000 @@ -52,32 +52,8 @@ DIE=1; fi -echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " -if (automake-1.7 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.7 - ACLOCAL=aclocal-1.7 -elif (automake-1.8 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.8 - ACLOCAL=aclocal-1.8 -elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.9 - ACLOCAL=aclocal-1.9 -elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.10 - ACLOCAL=aclocal-1.10 -elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.11 - ACLOCAL=aclocal-1.11 -elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.6 - ACLOCAL=aclocal-1.6 -else - echo - echo " You must have automake 1.6 or newer installed to compile $PROJECT." - echo " Download the appropriate package for your distribution," - echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/" - DIE=1 -fi +AUTOMAKE=automake +ACLOCAL=aclocal #if test x$AUTOMAKE != x; then # VER=`$AUTOMAKE --version \ diff -Nru gimp-plugin-registry-5.20120621/resynthesizer/bootchk-resynthesizer-28cade5/.gitignore gimp-plugin-registry-5.20120621+rpi3/resynthesizer/bootchk-resynthesizer-28cade5/.gitignore --- gimp-plugin-registry-5.20120621/resynthesizer/bootchk-resynthesizer-28cade5/.gitignore 2012-06-21 20:55:54.000000000 +0000 +++ gimp-plugin-registry-5.20120621+rpi3/resynthesizer/bootchk-resynthesizer-28cade5/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -# lkk 2011 -# git configuration: files to ignore for all time in all clones of this repository - -# You can also make this user specific: -# Copy this file to ~/.gitignore -# then: git config --global core.excludesfile ~/.gitignore -# OR edit the file pointed to by the core.excludesfile variable in ~/.gitconfig - -# Ignore editor backup files -*~ - -# Ignore Python byte compiled files -*.pyc - -# Ignore logs -*.log - -# Ignore object files -*.o - -# Ignore -*.Po - -# Ignore eclipse project -.project - -# http://www.gnu.org/software/automake -# Track all Makefile.in because users won't have automake to generate them - -# http://www.gnu.org/software/autoconf -# Don't track autoconf generated temporary files. -# Users don't need them, developers must generate their own - -/autom4te.cache -/aclocal.m4 -/compile -/configure -/depcomp -/install-sh -/missing diff -Nru gimp-plugin-registry-5.20120621/resynthesizer/src/autogen.sh gimp-plugin-registry-5.20120621+rpi3/resynthesizer/src/autogen.sh --- gimp-plugin-registry-5.20120621/resynthesizer/src/autogen.sh 2012-06-21 20:55:54.000000000 +0000 +++ gimp-plugin-registry-5.20120621+rpi3/resynthesizer/src/autogen.sh 2014-01-03 06:21:57.000000000 +0000 @@ -52,32 +52,8 @@ DIE=1; fi -echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " -if (automake-1.7 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.7 - ACLOCAL=aclocal-1.7 -elif (automake-1.8 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.8 - ACLOCAL=aclocal-1.8 -elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.9 - ACLOCAL=aclocal-1.9 -elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.10 - ACLOCAL=aclocal-1.10 -elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.11 - ACLOCAL=aclocal-1.11 -elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.6 - ACLOCAL=aclocal-1.6 -else - echo - echo " You must have automake 1.6 or newer installed to compile $PROJECT." - echo " Download the appropriate package for your distribution," - echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/" - DIE=1 -fi +AUTOMAKE=automake +ACLOCAL=aclocal #if test x$AUTOMAKE != x; then # VER=`$AUTOMAKE --version \ diff -Nru gimp-plugin-registry-5.20120621/resynthesizer/src/.gitignore gimp-plugin-registry-5.20120621+rpi3/resynthesizer/src/.gitignore --- gimp-plugin-registry-5.20120621/resynthesizer/src/.gitignore 2012-06-21 20:55:54.000000000 +0000 +++ gimp-plugin-registry-5.20120621+rpi3/resynthesizer/src/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -# lkk 2011 -# git configuration: files to ignore for all time in all clones of this repository - -# You can also make this user specific: -# Copy this file to ~/.gitignore -# then: git config --global core.excludesfile ~/.gitignore -# OR edit the file pointed to by the core.excludesfile variable in ~/.gitconfig - -# Ignore editor backup files -*~ - -# Ignore Python byte compiled files -*.pyc - -# Ignore logs -*.log - -# Ignore object files -*.o - -# Ignore -*.Po - -# Ignore eclipse project -.project - -# http://www.gnu.org/software/automake -# Track all Makefile.in because users won't have automake to generate them - -# http://www.gnu.org/software/autoconf -# Don't track autoconf generated temporary files. -# Users don't need them, developers must generate their own - -/autom4te.cache -/aclocal.m4 -/compile -/configure -/depcomp -/install-sh -/missing