--- /dev/null
+diff -upNr e_dbus.old/configure e_dbus.new/configure
+--- e_dbus.old/configure 2007-12-10 22:35:43.000000000 -0200
++++ e_dbus.new/configure 2007-12-10 22:36:29.000000000 -0200
+@@ -12751,18 +12751,18 @@ if test -n "$PKG_CONFIG"; then
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_EDBUS_CFLAGS=`$PKG_CONFIG --cflags "
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ " 2>/dev/null`
+ else
+@@ -12778,18 +12778,18 @@ if test -n "$PKG_CONFIG"; then
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_EDBUS_LIBS=`$PKG_CONFIG --libs "
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ " 2>/dev/null`
+ else
+@@ -12811,12 +12811,12 @@ else
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+ EDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ "`
+ else
+ EDBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ "`
+ fi
+@@ -12824,7 +12824,7 @@ fi
+ echo "$EDBUS_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ ) were not met:
+
+@@ -12838,7 +12838,7 @@ and EDBUS_LIBS to avoid the need to call
+ See the pkg-config man page for more details.
+ " >&5
+ echo "$as_me: error: Package requirements (
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ ) were not met:
+
+diff -upNr e_dbus.old/configure.in e_dbus.new/configure.in
+--- e_dbus.old/configure.in 2007-12-10 22:35:10.000000000 -0200
++++ e_dbus.new/configure.in 2007-12-10 22:35:59.000000000 -0200
+@@ -26,7 +26,7 @@ version_info=`expr $VMAJ + $VMIN`":$VMIC
+ AC_SUBST(version_info)
+
+ PKG_CHECK_MODULES([EDBUS], [
+- dbus-1 >= 0.62
++ dbus-1 >= 0.61
+ ecore >= 0.9.9
+ ])
+
+++ /dev/null
-diff -uN --exclude='Makefile*' dbus/dbus-signature.h dbus-dev/dbus-signature.h
---- e_dbus/src/lib/dbus/dbus-signature.h 1969-12-31 21:00:00.000000000 -0300
-+++ e_dbus/src/lib/dbus/dbus-signature.h 2007-09-19 18:16:16.000000000 -0300
-@@ -0,0 +1,74 @@
-+/* -*- mode: C; c-file-style: "gnu" -*- */
-+/* dbus-signatures.h utility functions for D-BUS types
-+ *
-+ * Copyright (C) 2005 Red Hat Inc.
-+ *
-+ * Licensed under the Academic Free License version 2.1
-+ *
-+ * This program 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 program 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 program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+#ifndef DBUS_SIGNATURES_H
-+#define DBUS_SIGNATURES_H
-+
-+#define DBUS_INSIDE_DBUS_H 1
-+
-+#include <dbus/dbus-macros.h>
-+#include <dbus/dbus-types.h>
-+#include <dbus/dbus-errors.h>
-+
-+DBUS_BEGIN_DECLS
-+
-+/**
-+ * DBusSignatureIter struct; contains no public fields
-+ */
-+typedef struct
-+{
-+ void *dummy1; /**< Don't use this */
-+ void *dummy2; /**< Don't use this */
-+ dbus_uint32_t dummy8; /**< Don't use this */
-+ int dummy12; /**< Don't use this */
-+ int dummy17; /**< Don't use this */
-+} DBusSignatureIter;
-+
-+void dbus_signature_iter_init (DBusSignatureIter *iter,
-+ const char *signature);
-+
-+int dbus_signature_iter_get_current_type (const DBusSignatureIter *iter);
-+
-+char * dbus_signature_iter_get_signature (const DBusSignatureIter *iter);
-+
-+int dbus_signature_iter_get_element_type (const DBusSignatureIter *iter);
-+
-+dbus_bool_t dbus_signature_iter_next (DBusSignatureIter *iter);
-+
-+void dbus_signature_iter_recurse (const DBusSignatureIter *iter,
-+ DBusSignatureIter *subiter);
-+
-+dbus_bool_t dbus_signature_validate (const char *signature,
-+ DBusError *error);
-+
-+dbus_bool_t dbus_signature_validate_single (const char *signature,
-+ DBusError *error);
-+
-+dbus_bool_t dbus_type_is_basic (int typecode);
-+dbus_bool_t dbus_type_is_container (int typecode);
-+dbus_bool_t dbus_type_is_fixed (int typecode);
-+
-+DBUS_END_DECLS
-+
-+#undef DBUS_INSIDE_DBUS_H
-+
-+#endif /* DBUS_MESSAGE_H */
-diff -uN --exclude='Makefile*' dbus/e_dbus_object.c dbus-dev/e_dbus_object.c
---- e_dbus/src/lib/dbus/e_dbus_object.c 2007-09-05 11:40:53.000000000 -0300
-+++ e_dbus/src/lib/dbus/e_dbus_object.c 2007-09-19 18:15:00.000000000 -0300
-@@ -5,6 +5,8 @@
- #include <stdlib.h>
- #include <string.h>
-
-+#include "dbus-signature.h"
-+
- static E_DBus_Interface *introspectable_interface = NULL;
- static E_DBus_Interface *properties_interface = NULL;
-
--- /dev/null
+diff -uN --exclude='Makefile*' dbus/dbus-signature.h dbus-dev/dbus-signature.h
+--- e_dbus/src/lib/dbus/dbus-signature.h 1969-12-31 21:00:00.000000000 -0300
++++ e_dbus/src/lib/dbus/dbus-signature.h 2007-09-19 18:16:16.000000000 -0300
+@@ -0,0 +1,74 @@
++/* -*- mode: C; c-file-style: "gnu" -*- */
++/* dbus-signatures.h utility functions for D-BUS types
++ *
++ * Copyright (C) 2005 Red Hat Inc.
++ *
++ * Licensed under the Academic Free License version 2.1
++ *
++ * This program 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 program 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 program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++#ifndef DBUS_SIGNATURES_H
++#define DBUS_SIGNATURES_H
++
++#define DBUS_INSIDE_DBUS_H 1
++
++#include <dbus/dbus-macros.h>
++#include <dbus/dbus-types.h>
++#include <dbus/dbus-errors.h>
++
++DBUS_BEGIN_DECLS
++
++/**
++ * DBusSignatureIter struct; contains no public fields
++ */
++typedef struct
++{
++ void *dummy1; /**< Don't use this */
++ void *dummy2; /**< Don't use this */
++ dbus_uint32_t dummy8; /**< Don't use this */
++ int dummy12; /**< Don't use this */
++ int dummy17; /**< Don't use this */
++} DBusSignatureIter;
++
++void dbus_signature_iter_init (DBusSignatureIter *iter,
++ const char *signature);
++
++int dbus_signature_iter_get_current_type (const DBusSignatureIter *iter);
++
++char * dbus_signature_iter_get_signature (const DBusSignatureIter *iter);
++
++int dbus_signature_iter_get_element_type (const DBusSignatureIter *iter);
++
++dbus_bool_t dbus_signature_iter_next (DBusSignatureIter *iter);
++
++void dbus_signature_iter_recurse (const DBusSignatureIter *iter,
++ DBusSignatureIter *subiter);
++
++dbus_bool_t dbus_signature_validate (const char *signature,
++ DBusError *error);
++
++dbus_bool_t dbus_signature_validate_single (const char *signature,
++ DBusError *error);
++
++dbus_bool_t dbus_type_is_basic (int typecode);
++dbus_bool_t dbus_type_is_container (int typecode);
++dbus_bool_t dbus_type_is_fixed (int typecode);
++
++DBUS_END_DECLS
++
++#undef DBUS_INSIDE_DBUS_H
++
++#endif /* DBUS_MESSAGE_H */
+diff -uN --exclude='Makefile*' dbus/e_dbus_object.c dbus-dev/e_dbus_object.c
+--- e_dbus/src/lib/dbus/e_dbus_object.c 2007-09-05 11:40:53.000000000 -0300
++++ e_dbus/src/lib/dbus/e_dbus_object.c 2007-09-19 18:15:00.000000000 -0300
+@@ -5,6 +5,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++#include "dbus-signature.h"
++
+ static E_DBus_Interface *introspectable_interface = NULL;
+ static E_DBus_Interface *properties_interface = NULL;
+
-01-e_dbus-bora-compile-fix.patch
+01-e_dbus-bora-compile-fix.diff
+02-dbus-signatures-h.diff
+++ /dev/null
-diff --git epeg.orig/Makefile.am epeg/Makefile.am
-index c1be1e9..0706d4d 100644
---- epeg.orig/Makefile.am
-+++ epeg/Makefile.am
-@@ -6,13 +6,12 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
- config.h.in config.sub configure install-sh \
- ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in epeg.c depcomp \
-- epeg.spec debian/changelog
-+ epeg.spec
-
- EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
- epeg.spec epeg.spec.in epeg.c.in gendoc \
- Doxyfile \
- debian/changelog \
-- debian/changelog.in \
- debian/control \
- debian/copyright \
- debian/libepeg0-dev.install \
-diff --git epeg.orig/configure.in epeg/configure.in
-index c0d99e2..e31f924 100644
---- epeg.orig/configure.in
-+++ epeg/configure.in
-@@ -44,7 +44,6 @@ epeg.spec
- src/Makefile
- src/lib/Makefile
- src/bin/Makefile
--debian/changelog
- ])
-
-
--- /dev/null
+diff -upNr epeg.old/Makefile.am epeg.new/Makefile.am
+--- epeg.old/Makefile.am 2007-12-10 22:10:27.000000000 -0200
++++ epeg.new/Makefile.am 2007-12-10 22:11:27.000000000 -0200
+@@ -6,19 +6,11 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ config.h.in config.sub configure install-sh \
+ ltconfig ltmain.sh missing mkinstalldirs \
+ stamp-h.in epeg.c depcomp \
+- epeg.spec debian/changelog
++ epeg.spec
+
+ EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
+ epeg.spec epeg.spec.in epeg.c.in gendoc \
+- Doxyfile \
+- debian/changelog \
+- debian/changelog.in \
+- debian/control \
+- debian/copyright \
+- debian/libepeg0-dev.install \
+- debian/epeg0-bin.install \
+- debian/libepeg0.install \
+- debian/rules
++ Doxyfile
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = epeg.pc
+diff -upNr epeg.old/Makefile.in epeg.new/Makefile.in
+--- epeg.old/Makefile.in 2007-12-10 22:11:50.000000000 -0200
++++ epeg.new/Makefile.in 2007-12-10 22:12:12.000000000 -0200
+@@ -38,10 +38,9 @@ host_triplet = @host@
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/epeg-uninstalled.pc.in $(srcdir)/epeg.pc.in \
+- $(srcdir)/epeg.spec.in $(top_srcdir)/configure \
+- $(top_srcdir)/debian/changelog.in AUTHORS COPYING ChangeLog \
+- INSTALL NEWS config.guess config.sub depcomp install-sh \
+- ltmain.sh missing
++ $(srcdir)/epeg.spec.in $(top_srcdir)/configure AUTHORS COPYING \
++ ChangeLog INSTALL NEWS config.guess config.sub depcomp \
++ install-sh ltmain.sh missing
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.in
+@@ -51,8 +50,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+ configure.lineno configure.status.lineno
+ mkinstalldirs = $(mkdir_p)
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = epeg.pc epeg-uninstalled.pc epeg.spec \
+- debian/changelog
++CONFIG_CLEAN_FILES = epeg.pc epeg-uninstalled.pc epeg.spec
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -176,19 +174,11 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ config.h.in config.sub configure install-sh \
+ ltconfig ltmain.sh missing mkinstalldirs \
+ stamp-h.in epeg.c depcomp \
+- epeg.spec debian/changelog
++ epeg.spec
+
+ EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
+ epeg.spec epeg.spec.in epeg.c.in gendoc \
+- Doxyfile \
+- debian/changelog \
+- debian/changelog.in \
+- debian/control \
+- debian/copyright \
+- debian/libepeg0-dev.install \
+- debian/epeg0-bin.install \
+- debian/libepeg0.install \
+- debian/rules
++ Doxyfile
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = epeg.pc
+@@ -252,8 +242,6 @@ epeg-uninstalled.pc: $(top_builddir)/con
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ epeg.spec: $(top_builddir)/config.status $(srcdir)/epeg.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+-debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
+- cd $(top_builddir) && $(SHELL) ./config.status $@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -405,7 +393,7 @@ distclean-tags:
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/debian
++ $(mkdir_p) $(distdir)/.
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+diff -upNr epeg.old/configure epeg.new/configure
+--- epeg.old/configure 2007-12-10 22:11:45.000000000 -0200
++++ epeg.new/configure 2007-12-10 22:12:07.000000000 -0200
+@@ -14650,7 +14650,7 @@ my_libs="-ljpeg"
+
+
+
+- ac_config_files="$ac_config_files Makefile epeg.pc epeg-uninstalled.pc epeg.spec src/Makefile src/lib/Makefile src/bin/Makefile debian/changelog"
++ ac_config_files="$ac_config_files Makefile epeg.pc epeg-uninstalled.pc epeg.spec src/Makefile src/lib/Makefile src/bin/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -15221,7 +15221,6 @@ do
+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
+ "src/bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/bin/Makefile" ;;
+- "debian/changelog" ) CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
+ "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 -upNr epeg.old/configure.in epeg.new/configure.in
+--- epeg.old/configure.in 2007-12-10 22:10:27.000000000 -0200
++++ epeg.new/configure.in 2007-12-10 22:11:14.000000000 -0200
+@@ -44,7 +44,6 @@ epeg.spec
+ src/Makefile
+ src/lib/Makefile
+ src/bin/Makefile
+-debian/changelog
+ ])
+
+
-01_dont_overwrite_changelog
+01_dont_overwrite_changelog.diff
+++ /dev/null
-diff --git epsilon.orig/Makefile.am epsilon/Makefile.am
-index aaa98b2..1128063 100644
---- epsilon.orig/Makefile.am
-+++ epsilon/Makefile.am
-@@ -9,7 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
- epsilon.spec epsilon.pc depcomp
-
- EXTRA_DIST = README AUTHORS COPYING epsilon.spec.in epsilon.spec gendoc \
-- Doxyfile debian/changelog debian/changelog.in debian/rules \
-+ Doxyfile debian/rules \
- debian/copyright debian/control debian/epsilon0-bin.install \
- debian/libepsilon0.install debian/libepsilon0-dev.install \
- epsilon.pc.in
-diff --git epsilon.orig/configure.in epsilon/configure.in
-index 978a3b1..86fa444 100644
---- epsilon.orig/configure.in
-+++ epsilon/configure.in
-@@ -106,7 +106,6 @@ src/lib/Makefile
- src/lib/exiftags/Makefile
- src/bin/Makefile
- src/plugins/Makefile
--debian/changelog
- ])
-
-
--- /dev/null
+diff -upNr epsilon.old/Makefile.am epsilon.new/Makefile.am
+--- epsilon.old/Makefile.am 2007-12-10 22:14:36.000000000 -0200
++++ epsilon.new/Makefile.am 2007-12-10 22:15:36.000000000 -0200
+@@ -9,10 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ epsilon.spec epsilon.pc depcomp
+
+ EXTRA_DIST = README AUTHORS COPYING epsilon.spec.in epsilon.spec gendoc \
+- Doxyfile debian/changelog debian/changelog.in debian/rules \
+- debian/copyright debian/control debian/epsilon0-bin.install \
+- debian/libepsilon0.install debian/libepsilon0-dev.install \
+- epsilon.pc.in
++ Doxyfile epsilon.pc.in
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = epsilon.pc
+diff -upNr epsilon.old/Makefile.in epsilon.new/Makefile.in
+--- epsilon.old/Makefile.in 2007-12-10 22:15:00.000000000 -0200
++++ epsilon.new/Makefile.in 2007-12-10 22:15:54.000000000 -0200
+@@ -37,10 +37,9 @@ POST_UNINSTALL = :
+ host_triplet = @host@
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/epsilon.pc.in \
+- $(srcdir)/epsilon.spec.in $(top_srcdir)/configure \
+- $(top_srcdir)/debian/changelog.in AUTHORS COPYING ChangeLog \
+- INSTALL NEWS TODO config.guess config.sub depcomp install-sh \
+- ltmain.sh missing
++ $(srcdir)/epsilon.spec.in $(top_srcdir)/configure AUTHORS \
++ COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
++ depcomp install-sh ltmain.sh missing
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.in
+@@ -50,7 +49,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+ configure.lineno configure.status.lineno
+ mkinstalldirs = $(mkdir_p)
+ CONFIG_HEADER = $(top_builddir)/src/config.h
+-CONFIG_CLEAN_FILES = epsilon.pc epsilon.spec debian/changelog
++CONFIG_CLEAN_FILES = epsilon.pc epsilon.spec
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -195,10 +194,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ epsilon.spec epsilon.pc depcomp
+
+ EXTRA_DIST = README AUTHORS COPYING epsilon.spec.in epsilon.spec gendoc \
+- Doxyfile debian/changelog debian/changelog.in debian/rules \
+- debian/copyright debian/control debian/epsilon0-bin.install \
+- debian/libepsilon0.install debian/libepsilon0-dev.install \
+- epsilon.pc.in
++ Doxyfile epsilon.pc.in
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = epsilon.pc
+@@ -242,8 +238,6 @@ epsilon.pc: $(top_builddir)/config.statu
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ epsilon.spec: $(top_builddir)/config.status $(srcdir)/epsilon.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+-debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
+- cd $(top_builddir) && $(SHELL) ./config.status $@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -395,7 +389,7 @@ distclean-tags:
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/debian
++ $(mkdir_p) $(distdir)/.
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+diff -upNr epsilon.old/configure epsilon.new/configure
+--- epsilon.old/configure 2007-12-10 22:14:55.000000000 -0200
++++ epsilon.new/configure 2007-12-10 22:15:48.000000000 -0200
+@@ -14988,7 +14988,7 @@ requirements="imlib2 evas ecore-evas eco
+ #####################################################################
+ ## Output
+
+- ac_config_files="$ac_config_files Makefile epsilon.pc epsilon.spec src/Makefile src/include/Makefile src/lib/Makefile src/lib/exiftags/Makefile src/bin/Makefile src/plugins/Makefile debian/changelog"
++ ac_config_files="$ac_config_files Makefile epsilon.pc epsilon.spec src/Makefile src/include/Makefile src/lib/Makefile src/lib/exiftags/Makefile src/bin/Makefile src/plugins/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -15561,7 +15561,6 @@ do
+ "src/lib/exiftags/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/exiftags/Makefile" ;;
+ "src/bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/bin/Makefile" ;;
+ "src/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;
+- "debian/changelog" ) CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+diff -upNr epsilon.old/configure.in epsilon.new/configure.in
+--- epsilon.old/configure.in 2007-12-10 22:14:36.000000000 -0200
++++ epsilon.new/configure.in 2007-12-10 22:15:13.000000000 -0200
+@@ -106,7 +106,6 @@ src/lib/Makefile
+ src/lib/exiftags/Makefile
+ src/bin/Makefile
+ src/plugins/Makefile
+-debian/changelog
+ ])
+
+
+++ /dev/null
-diff -upNr epsilon.orig/src/lib/Epsilon.c epsilon/src/lib/Epsilon.c
---- epsilon.orig/src/lib/Epsilon.c 2007-12-05 20:26:23.000000000 -0200
-+++ epsilon/src/lib/Epsilon.c 2007-12-09 12:15:21.000000000 -0200
-@@ -23,6 +23,9 @@
- #ifdef HAVE_EPEG_H
- #include <Epeg.h>
- #endif
-+#define THUMB_HEIGHT_CANOLA 96
-+#define THUMB_WIDTH_CANOLA 192
-+#define THUMB_SIZE_CANOLA 192
- #define THUMB_SIZE_NORMAL 128
- #define THUMB_SIZE_LARGE 256
- #define THUMB_SIZE_FAIL -1
-@@ -38,9 +41,11 @@
-
- static char *PATH_DIR_LARGE = NULL;
- static char *PATH_DIR_NORMAL = NULL;
-+static char *PATH_DIR_CANOLA = NULL;
- static char *PATH_DIR_FAIL = NULL;
- static unsigned LEN_DIR_LARGE = 0;
- static unsigned LEN_DIR_NORMAL = 0;
-+static unsigned LEN_DIR_CANOLA = 0;
- static unsigned LEN_DIR_FAIL = 0;
-
-
-@@ -153,6 +158,11 @@ epsilon_init (void)
- PATH_DIR_NORMAL = strdup(buf);
- LEN_DIR_NORMAL = strlen(buf);
- }
-+ if (!PATH_DIR_CANOLA) {
-+ strncpy(buf + base_len, "/canola", PATH_MAX - base_len);
-+ PATH_DIR_CANOLA = strdup(buf);
-+ LEN_DIR_CANOLA = strlen(buf);
-+ }
- if (!PATH_DIR_FAIL) {
- strncpy(buf + base_len, "/fail/epsilon", PATH_MAX - base_len);
- PATH_DIR_FAIL = strdup(buf);
-@@ -161,6 +171,7 @@ epsilon_init (void)
-
- ecore_file_mkpath(PATH_DIR_LARGE);
- ecore_file_mkpath(PATH_DIR_NORMAL);
-+ ecore_file_mkpath(PATH_DIR_CANOLA);
- ecore_file_mkpath(PATH_DIR_FAIL);
-
- plugins_mime = ecore_hash_new(ecore_str_hash, ecore_str_compare);
-@@ -446,6 +457,11 @@ _epsilon_file_name(unsigned thumb_size,
- dir = PATH_DIR_NORMAL;
- dir_len = LEN_DIR_NORMAL;
- }
-+ else if (thumb_size == THUMB_SIZE_CANOLA)
-+ {
-+ dir = PATH_DIR_CANOLA;
-+ dir_len = LEN_DIR_CANOLA;
-+ }
- else
- {
- dir = PATH_DIR_FAIL;
-@@ -563,10 +579,10 @@ epsilon_generate (Epsilon * e)
-
- if (!e || !e->src || !e->hash)
- return (EPSILON_FAIL);
--
-+
- tw = e->tw;
- th = e->th;
--
-+
- #ifdef HAVE_EPEG_H
- len = strlen (e->src);
- if ((len > 4) &&
-@@ -575,15 +591,16 @@ epsilon_generate (Epsilon * e)
- _epsilon_file_name(e->tw, e->hash, "jpg", outfile, sizeof(outfile));
- epeg_thumbnail_comments_get (im, &info);
- epeg_size_get (im, &iw, &ih);
-- if (iw > ih)
-+ /* XXX - hack to force fixed height in case of tw != th (canola) */
-+ if (iw > ih && tw == th)
- {
-- th = e->th * ((double) ih / (double) iw);
-- if (th < 1) th = 1;
-+ th = ((unsigned long) e->tw * ih) / iw;
-+ if (th < 1) th = 1;
- }
- else
- {
-- tw = e->tw * ((double) iw / (double) ih);
-- if (tw < 1) tw = 1;
-+ tw = ((unsigned long) e->th * iw) / ih;
-+ if (tw < 1) tw = 1;
- }
- epeg_decode_size_set (im, tw, th);
- epeg_quality_set (im, 100);
-@@ -738,7 +755,7 @@ void
- epsilon_thumb_size(Epsilon *e, Epsilon_Thumb_Size size)
- {
- if (!e) return;
--
-+
- switch (size)
- {
- case EPSILON_THUMB_NORMAL:
-@@ -749,7 +766,11 @@ epsilon_thumb_size(Epsilon *e, Epsilon_T
- e->tw = THUMB_SIZE_LARGE;
- e->th = THUMB_SIZE_LARGE;
- break;
-- }
-+ case EPSILON_THUMB_CANOLA:
-+ e->tw = THUMB_WIDTH_CANOLA;
-+ e->th = THUMB_HEIGHT_CANOLA;
-+ break;
-+ }
- }
-
-
-diff -upNr epsilon.orig/src/lib/Epsilon.h epsilon/src/lib/Epsilon.h
---- epsilon.orig/src/lib/Epsilon.h 2007-12-05 20:26:23.000000000 -0200
-+++ epsilon/src/lib/Epsilon.h 2007-12-09 12:15:21.000000000 -0200
-@@ -58,7 +58,8 @@ typedef struct _Epsilon_Info Epsilon_Inf
- enum _Epsilon_Thumb_Size
- {
- EPSILON_THUMB_NORMAL,
-- EPSILON_THUMB_LARGE
-+ EPSILON_THUMB_LARGE,
-+ EPSILON_THUMB_CANOLA
- };
-
- typedef enum _Epsilon_Thumb_Size Epsilon_Thumb_Size;
-diff -upNr epsilon.orig/src/lib/epsilon_thumb.c epsilon/src/lib/epsilon_thumb.c
---- epsilon.orig/src/lib/epsilon_thumb.c 2007-12-05 20:26:23.000000000 -0200
-+++ epsilon/src/lib/epsilon_thumb.c 2007-12-09 12:15:21.000000000 -0200
-@@ -218,6 +218,9 @@ epsilon_cb_server_data(void *data, int t
- if (e->server != epsilon_server)
- return 1;
-
-+ if (!(e && e->data))
-+ return 1;
-+
- msg = e->data;
- Epsilon_Request *thumb;
-
-diff -upNr epsilon.orig/src/lib/exiftags/canon.c epsilon/src/lib/exiftags/canon.c
---- epsilon.orig/src/lib/exiftags/canon.c 2007-12-05 20:26:23.000000000 -0200
-+++ epsilon/src/lib/exiftags/canon.c 2007-12-09 12:15:21.000000000 -0200
-@@ -52,7 +52,7 @@
- struct ccstm {
- int32_t val;
- struct descrip *table;
-- const char descr[];
-+ const char *descr;
- };
-
-
--- /dev/null
+diff -upNr epsilon.orig/src/lib/Epsilon.c epsilon/src/lib/Epsilon.c
+--- epsilon.orig/src/lib/Epsilon.c 2007-12-05 20:26:23.000000000 -0200
++++ epsilon/src/lib/Epsilon.c 2007-12-09 12:15:21.000000000 -0200
+@@ -23,6 +23,9 @@
+ #ifdef HAVE_EPEG_H
+ #include <Epeg.h>
+ #endif
++#define THUMB_HEIGHT_CANOLA 96
++#define THUMB_WIDTH_CANOLA 192
++#define THUMB_SIZE_CANOLA 192
+ #define THUMB_SIZE_NORMAL 128
+ #define THUMB_SIZE_LARGE 256
+ #define THUMB_SIZE_FAIL -1
+@@ -38,9 +41,11 @@
+
+ static char *PATH_DIR_LARGE = NULL;
+ static char *PATH_DIR_NORMAL = NULL;
++static char *PATH_DIR_CANOLA = NULL;
+ static char *PATH_DIR_FAIL = NULL;
+ static unsigned LEN_DIR_LARGE = 0;
+ static unsigned LEN_DIR_NORMAL = 0;
++static unsigned LEN_DIR_CANOLA = 0;
+ static unsigned LEN_DIR_FAIL = 0;
+
+
+@@ -153,6 +158,11 @@ epsilon_init (void)
+ PATH_DIR_NORMAL = strdup(buf);
+ LEN_DIR_NORMAL = strlen(buf);
+ }
++ if (!PATH_DIR_CANOLA) {
++ strncpy(buf + base_len, "/canola", PATH_MAX - base_len);
++ PATH_DIR_CANOLA = strdup(buf);
++ LEN_DIR_CANOLA = strlen(buf);
++ }
+ if (!PATH_DIR_FAIL) {
+ strncpy(buf + base_len, "/fail/epsilon", PATH_MAX - base_len);
+ PATH_DIR_FAIL = strdup(buf);
+@@ -161,6 +171,7 @@ epsilon_init (void)
+
+ ecore_file_mkpath(PATH_DIR_LARGE);
+ ecore_file_mkpath(PATH_DIR_NORMAL);
++ ecore_file_mkpath(PATH_DIR_CANOLA);
+ ecore_file_mkpath(PATH_DIR_FAIL);
+
+ plugins_mime = ecore_hash_new(ecore_str_hash, ecore_str_compare);
+@@ -446,6 +457,11 @@ _epsilon_file_name(unsigned thumb_size,
+ dir = PATH_DIR_NORMAL;
+ dir_len = LEN_DIR_NORMAL;
+ }
++ else if (thumb_size == THUMB_SIZE_CANOLA)
++ {
++ dir = PATH_DIR_CANOLA;
++ dir_len = LEN_DIR_CANOLA;
++ }
+ else
+ {
+ dir = PATH_DIR_FAIL;
+@@ -563,10 +579,10 @@ epsilon_generate (Epsilon * e)
+
+ if (!e || !e->src || !e->hash)
+ return (EPSILON_FAIL);
+-
++
+ tw = e->tw;
+ th = e->th;
+-
++
+ #ifdef HAVE_EPEG_H
+ len = strlen (e->src);
+ if ((len > 4) &&
+@@ -575,15 +591,16 @@ epsilon_generate (Epsilon * e)
+ _epsilon_file_name(e->tw, e->hash, "jpg", outfile, sizeof(outfile));
+ epeg_thumbnail_comments_get (im, &info);
+ epeg_size_get (im, &iw, &ih);
+- if (iw > ih)
++ /* XXX - hack to force fixed height in case of tw != th (canola) */
++ if (iw > ih && tw == th)
+ {
+- th = e->th * ((double) ih / (double) iw);
+- if (th < 1) th = 1;
++ th = ((unsigned long) e->tw * ih) / iw;
++ if (th < 1) th = 1;
+ }
+ else
+ {
+- tw = e->tw * ((double) iw / (double) ih);
+- if (tw < 1) tw = 1;
++ tw = ((unsigned long) e->th * iw) / ih;
++ if (tw < 1) tw = 1;
+ }
+ epeg_decode_size_set (im, tw, th);
+ epeg_quality_set (im, 100);
+@@ -738,7 +755,7 @@ void
+ epsilon_thumb_size(Epsilon *e, Epsilon_Thumb_Size size)
+ {
+ if (!e) return;
+-
++
+ switch (size)
+ {
+ case EPSILON_THUMB_NORMAL:
+@@ -749,7 +766,11 @@ epsilon_thumb_size(Epsilon *e, Epsilon_T
+ e->tw = THUMB_SIZE_LARGE;
+ e->th = THUMB_SIZE_LARGE;
+ break;
+- }
++ case EPSILON_THUMB_CANOLA:
++ e->tw = THUMB_WIDTH_CANOLA;
++ e->th = THUMB_HEIGHT_CANOLA;
++ break;
++ }
+ }
+
+
+diff -upNr epsilon.orig/src/lib/Epsilon.h epsilon/src/lib/Epsilon.h
+--- epsilon.orig/src/lib/Epsilon.h 2007-12-05 20:26:23.000000000 -0200
++++ epsilon/src/lib/Epsilon.h 2007-12-09 12:15:21.000000000 -0200
+@@ -58,7 +58,8 @@ typedef struct _Epsilon_Info Epsilon_Inf
+ enum _Epsilon_Thumb_Size
+ {
+ EPSILON_THUMB_NORMAL,
+- EPSILON_THUMB_LARGE
++ EPSILON_THUMB_LARGE,
++ EPSILON_THUMB_CANOLA
+ };
+
+ typedef enum _Epsilon_Thumb_Size Epsilon_Thumb_Size;
+diff -upNr epsilon.orig/src/lib/epsilon_thumb.c epsilon/src/lib/epsilon_thumb.c
+--- epsilon.orig/src/lib/epsilon_thumb.c 2007-12-05 20:26:23.000000000 -0200
++++ epsilon/src/lib/epsilon_thumb.c 2007-12-09 12:15:21.000000000 -0200
+@@ -218,6 +218,9 @@ epsilon_cb_server_data(void *data, int t
+ if (e->server != epsilon_server)
+ return 1;
+
++ if (!(e && e->data))
++ return 1;
++
+ msg = e->data;
+ Epsilon_Request *thumb;
+
+diff -upNr epsilon.orig/src/lib/exiftags/canon.c epsilon/src/lib/exiftags/canon.c
+--- epsilon.orig/src/lib/exiftags/canon.c 2007-12-05 20:26:23.000000000 -0200
++++ epsilon/src/lib/exiftags/canon.c 2007-12-09 12:15:21.000000000 -0200
+@@ -52,7 +52,7 @@
+ struct ccstm {
+ int32_t val;
+ struct descrip *table;
+- const char descr[];
++ const char *descr;
+ };
+
+
-01_dont_overwrite_changelog
-02_epsilon_thumb_canola
+01_dont_overwrite_changelog.diff
+02_epsilon_thumb_canola.diff
+++ /dev/null
-diff --git etk.orig/Makefile.am etk/Makefile.am
-index 4342416..427c95b 100644
---- etk.orig/Makefile.am
-+++ etk/Makefile.am
-@@ -22,8 +22,6 @@ ABOUT-NLS \
- etk.pc.in \
- etk.spec.in \
- etk.spec \
--debian/changelog \
--debian/changelog.in \
- debian/libetk0.install \
- debian/libetk0-dev.install \
- debian/etk0-bin.install \
-diff --git etk.orig/configure.in etk/configure.in
-index e81d51b..293b533 100644
---- etk.orig/configure.in
-+++ etk/configure.in
-@@ -225,7 +225,6 @@ data/icons/default/icons/48x48/status/Makefile
- data/icons/default/Makefile
- po/Makefile
- intl/Makefile
--debian/changelog
- ])
-
- #####################################################################
--- /dev/null
+diff -upNr etk.old/Makefile.am etk.new/Makefile.am
+--- etk.old/Makefile.am 2007-12-10 22:53:37.000000000 -0200
++++ etk.new/Makefile.am 2007-12-10 22:53:37.000000000 -0200
+@@ -7,8 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ ltconfig ltmain.sh missing mkinstalldirs \
+ stamp-h.in build-stamp configure-stamp depcomp \
+ etk_docs.tar.gz \
+- etk.pc \
+- debian/changelog
++ etk.pc
+
+ bin_SCRIPTS =
+
+@@ -21,15 +20,7 @@ README \
+ ABOUT-NLS \
+ etk.pc.in \
+ etk.spec.in \
+-etk.spec \
+-debian/changelog \
+-debian/changelog.in \
+-debian/libetk0.install \
+-debian/libetk0-dev.install \
+-debian/etk0-bin.install \
+-debian/control \
+-debian/copyright \
+-debian/rules
++etk.spec
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = etk.pc
+diff -upNr etk.old/Makefile.in etk.new/Makefile.in
+--- etk.old/Makefile.in 2007-12-10 22:54:30.000000000 -0200
++++ etk.new/Makefile.in 2007-12-10 22:56:43.000000000 -0200
+@@ -39,10 +39,9 @@ host_triplet = @host@
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/etk.pc.in $(srcdir)/etk.spec.in \
+- $(top_srcdir)/configure $(top_srcdir)/debian/changelog.in \
+- ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS TODO \
+- config.guess config.rpath config.sub depcomp install-sh \
+- ltmain.sh missing mkinstalldirs
++ $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
++ INSTALL NEWS TODO config.guess config.rpath config.sub depcomp \
++ install-sh ltmain.sh missing mkinstalldirs
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+@@ -57,7 +56,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+ configure.lineno configure.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = etk.spec etk.pc debian/changelog
++CONFIG_CLEAN_FILES = etk.spec etk.pc
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+@@ -215,8 +214,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ ltconfig ltmain.sh missing mkinstalldirs \
+ stamp-h.in build-stamp configure-stamp depcomp \
+ etk_docs.tar.gz \
+- etk.pc \
+- debian/changelog
++ etk.pc
+
+ bin_SCRIPTS =
+ EXTRA_DIST = \
+@@ -228,15 +226,7 @@ README \
+ ABOUT-NLS \
+ etk.pc.in \
+ etk.spec.in \
+-etk.spec \
+-debian/changelog \
+-debian/changelog.in \
+-debian/libetk0.install \
+-debian/libetk0-dev.install \
+-debian/etk0-bin.install \
+-debian/control \
+-debian/copyright \
+-debian/rules
++etk.spec
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = etk.pc
+@@ -299,8 +289,6 @@ etk.spec: $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ etk.pc: $(top_builddir)/config.status $(srcdir)/etk.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+-debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
+- cd $(top_builddir) && $(SHELL) ./config.status $@
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+@@ -471,7 +459,7 @@ distclean-tags:
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/debian $(distdir)/m4
++ $(mkdir_p) $(distdir)/. $(distdir)/m4
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+diff -upNr etk.old/configure etk.new/configure
+--- etk.old/configure 2007-12-10 22:54:10.000000000 -0200
++++ etk.new/configure 2007-12-10 22:56:23.000000000 -0200
+@@ -23867,7 +23867,7 @@ _ACEOF
+ #####################################################################
+ ## Output
+
+- ac_config_files="$ac_config_files Makefile etk.spec etk.pc src/Makefile src/lib/Makefile src/engines/Makefile src/engines/ecore_evas/Makefile src/engines/ecore_evas_x11/Makefile src/engines/ecore_evas_software_x11/Makefile src/engines/ecore_evas_software_x11_16/Makefile src/engines/ecore_evas_gl_x11/Makefile src/engines/ecore_fb/Makefile src/bin/Makefile src/tools/Makefile src/tools/etk_prefs/Makefile data/Makefile data/themes/Makefile data/themes/default/Makefile data/themes/default/widgets/Makefile data/themes/default/fonts/Makefile data/themes/default/images/Makefile data/themes/default/macros/Makefile data/wm/Makefile data/wm/default/Makefile data/wm/default/fonts/Makefile data/wm/default/images/Makefile data/fonts/Makefile data/images/Makefile data/icons/Makefile data/icons/default/icons/Makefile data/icons/default/icons/16x16/Makefile data/icons/default/icons/16x16/actions/Makefile data/icons/default/icons/16x16/apps/Makefile data/icons/default/icons/16x16/categories/Makefile data/icons/default/icons/16x16/devices/Makefile data/icons/default/icons/16x16/emblems/Makefile data/icons/default/icons/16x16/emotes/Makefile data/icons/default/icons/16x16/mimetypes/Makefile data/icons/default/icons/16x16/places/Makefile data/icons/default/icons/16x16/status/Makefile data/icons/default/icons/22x22/Makefile data/icons/default/icons/22x22/actions/Makefile data/icons/default/icons/22x22/apps/Makefile data/icons/default/icons/22x22/categories/Makefile data/icons/default/icons/22x22/devices/Makefile data/icons/default/icons/22x22/emblems/Makefile data/icons/default/icons/22x22/emotes/Makefile data/icons/default/icons/22x22/mimetypes/Makefile data/icons/default/icons/22x22/places/Makefile data/icons/default/icons/22x22/status/Makefile data/icons/default/icons/48x48/Makefile data/icons/default/icons/48x48/actions/Makefile data/icons/default/icons/48x48/apps/Makefile data/icons/default/icons/48x48/categories/Makefile data/icons/default/icons/48x48/devices/Makefile data/icons/default/icons/48x48/emblems/Makefile data/icons/default/icons/48x48/emotes/Makefile data/icons/default/icons/48x48/mimetypes/Makefile data/icons/default/icons/48x48/places/Makefile data/icons/default/icons/48x48/status/Makefile data/icons/default/Makefile po/Makefile intl/Makefile debian/changelog"
++ ac_config_files="$ac_config_files Makefile etk.spec etk.pc src/Makefile src/lib/Makefile src/engines/Makefile src/engines/ecore_evas/Makefile src/engines/ecore_evas_x11/Makefile src/engines/ecore_evas_software_x11/Makefile src/engines/ecore_evas_software_x11_16/Makefile src/engines/ecore_evas_gl_x11/Makefile src/engines/ecore_fb/Makefile src/bin/Makefile src/tools/Makefile src/tools/etk_prefs/Makefile data/Makefile data/themes/Makefile data/themes/default/Makefile data/themes/default/widgets/Makefile data/themes/default/fonts/Makefile data/themes/default/images/Makefile data/themes/default/macros/Makefile data/wm/Makefile data/wm/default/Makefile data/wm/default/fonts/Makefile data/wm/default/images/Makefile data/fonts/Makefile data/images/Makefile data/icons/Makefile data/icons/default/icons/Makefile data/icons/default/icons/16x16/Makefile data/icons/default/icons/16x16/actions/Makefile data/icons/default/icons/16x16/apps/Makefile data/icons/default/icons/16x16/categories/Makefile data/icons/default/icons/16x16/devices/Makefile data/icons/default/icons/16x16/emblems/Makefile data/icons/default/icons/16x16/emotes/Makefile data/icons/default/icons/16x16/mimetypes/Makefile data/icons/default/icons/16x16/places/Makefile data/icons/default/icons/16x16/status/Makefile data/icons/default/icons/22x22/Makefile data/icons/default/icons/22x22/actions/Makefile data/icons/default/icons/22x22/apps/Makefile data/icons/default/icons/22x22/categories/Makefile data/icons/default/icons/22x22/devices/Makefile data/icons/default/icons/22x22/emblems/Makefile data/icons/default/icons/22x22/emotes/Makefile data/icons/default/icons/22x22/mimetypes/Makefile data/icons/default/icons/22x22/places/Makefile data/icons/default/icons/22x22/status/Makefile data/icons/default/icons/48x48/Makefile data/icons/default/icons/48x48/actions/Makefile data/icons/default/icons/48x48/apps/Makefile data/icons/default/icons/48x48/categories/Makefile data/icons/default/icons/48x48/devices/Makefile data/icons/default/icons/48x48/emblems/Makefile data/icons/default/icons/48x48/emotes/Makefile data/icons/default/icons/48x48/mimetypes/Makefile data/icons/default/icons/48x48/places/Makefile data/icons/default/icons/48x48/status/Makefile data/icons/default/Makefile po/Makefile intl/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -24508,7 +24508,6 @@ do
+ "data/icons/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/icons/default/Makefile" ;;
+ "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
+ "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+- "debian/changelog" ) CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+diff -upNr etk.old/configure.in etk.new/configure.in
+--- etk.old/configure.in 2007-12-10 22:53:37.000000000 -0200
++++ etk.new/configure.in 2007-12-10 22:53:37.000000000 -0200
+@@ -225,7 +225,6 @@ data/icons/default/icons/48x48/status/Ma
+ data/icons/default/Makefile
+ po/Makefile
+ intl/Makefile
+-debian/changelog
+ ])
+
+ #####################################################################
-01_dont_overwrite_changelog
+01_dont_overwrite_changelog.diff
+++ /dev/null
-diff --git imlib2.orig/Makefile.am imlib2/Makefile.am
-index 6418a28..ab40533 100644
---- imlib2.orig/Makefile.am
-+++ imlib2/Makefile.am
-@@ -9,8 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
- imlib2_docs.tar.gz imlib2.c \
- README \
- imlib2.pc \
-- imlib2.spec \
-- debian/changelog
-+ imlib2.spec
-
- bin_SCRIPTS = imlib2-config
-
-@@ -19,8 +18,6 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
- README.in README \
- imlib2.pc.in \
- imlib2.spec.in imlib2.spec \
-- debian/changelog \
-- debian/changelog.in \
- debian/control \
- debian/copyright \
- debian/imlib2-config.1 \
-diff --git imlib2.orig/configure.in imlib2/configure.in
-index 0332f68..e458b9a 100644
---- imlib2.orig/configure.in
-+++ imlib2/configure.in
-@@ -583,7 +583,6 @@ doc/Makefile
- imlib2-config
- README
- imlib2.spec
--debian/changelog
- ],[
- chmod +x imlib2-config
- ])
--- /dev/null
+diff -upNr imlib2.old/Makefile.am imlib2.new/Makefile.am
+--- imlib2.old/Makefile.am 2007-12-10 21:58:54.000000000 -0200
++++ imlib2.new/Makefile.am 2007-12-10 22:00:35.000000000 -0200
+@@ -9,8 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ imlib2_docs.tar.gz imlib2.c \
+ README \
+ imlib2.pc \
+- imlib2.spec \
+- debian/changelog
++ imlib2.spec
+
+ bin_SCRIPTS = imlib2-config
+
+@@ -18,18 +17,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLA
+ Doxyfile \
+ README.in README \
+ imlib2.pc.in \
+- imlib2.spec.in imlib2.spec \
+- debian/changelog \
+- debian/changelog.in \
+- debian/control \
+- debian/copyright \
+- debian/imlib2-config.1 \
+- debian/imlib2-demo.install \
+- debian/imlib2-test.install \
+- debian/libimlib2-dev.doc-base \
+- debian/libimlib2-dev.install \
+- debian/libimlib2.install \
+- debian/rules
++ imlib2.spec.in imlib2.spec
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = imlib2.pc
+diff -upNr imlib2.old/Makefile.in imlib2.new/Makefile.in
+--- imlib2.old/Makefile.in 2007-12-10 21:59:52.000000000 -0200
++++ imlib2.new/Makefile.in 2007-12-10 22:01:00.000000000 -0200
+@@ -40,9 +40,9 @@ DIST_COMMON = README $(am__configure_dep
+ $(srcdir)/Makefile.in $(srcdir)/README.in \
+ $(srcdir)/config.h.in $(srcdir)/imlib2-config.in \
+ $(srcdir)/imlib2.pc.in $(srcdir)/imlib2.spec.in \
+- $(top_srcdir)/configure $(top_srcdir)/debian/changelog.in \
+- AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
+- config.sub depcomp install-sh ltmain.sh missing
++ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
++ TODO config.guess config.sub depcomp install-sh ltmain.sh \
++ missing
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.in
+@@ -52,8 +52,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+ configure.lineno configure.status.lineno
+ mkinstalldirs = $(mkdir_p)
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec \
+- debian/changelog
++CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+@@ -213,26 +212,14 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ imlib2_docs.tar.gz imlib2.c \
+ README \
+ imlib2.pc \
+- imlib2.spec \
+- debian/changelog
++ imlib2.spec
+
+ bin_SCRIPTS = imlib2-config
+ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
+ Doxyfile \
+ README.in README \
+ imlib2.pc.in \
+- imlib2.spec.in imlib2.spec \
+- debian/changelog \
+- debian/changelog.in \
+- debian/control \
+- debian/copyright \
+- debian/imlib2-config.1 \
+- debian/imlib2-demo.install \
+- debian/imlib2-test.install \
+- debian/libimlib2-dev.doc-base \
+- debian/libimlib2-dev.install \
+- debian/libimlib2.install \
+- debian/rules
++ imlib2.spec.in imlib2.spec
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = imlib2.pc
+@@ -298,8 +285,6 @@ README: $(top_builddir)/config.status $(
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ imlib2.spec: $(top_builddir)/config.status $(srcdir)/imlib2.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+-debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
+- cd $(top_builddir) && $(SHELL) ./config.status $@
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+@@ -470,7 +455,7 @@ distclean-tags:
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/debian
++ $(mkdir_p) $(distdir)/.
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+diff -upNr imlib2.old/configure imlib2.new/configure
+--- imlib2.old/configure 2007-12-10 21:59:43.000000000 -0200
++++ imlib2.new/configure 2007-12-10 22:00:51.000000000 -0200
+@@ -24340,7 +24340,7 @@ if test "x$enable_visibility_hiding" = x
+ CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
+ fi
+
+- ac_config_files="$ac_config_files Makefile imlib2.pc src/Makefile src/lib/Makefile src/bin/Makefile src/modules/Makefile src/modules/filters/Makefile src/modules/loaders/Makefile data/Makefile data/fonts/Makefile data/images/Makefile doc/Makefile imlib2-config README imlib2.spec debian/changelog"
++ ac_config_files="$ac_config_files Makefile imlib2.pc src/Makefile src/lib/Makefile src/bin/Makefile src/modules/Makefile src/modules/filters/Makefile src/modules/loaders/Makefile data/Makefile data/fonts/Makefile data/images/Makefile doc/Makefile imlib2-config README imlib2.spec"
+ ac_config_commands="$ac_config_commands default"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -24983,7 +24983,6 @@ do
+ "imlib2-config" ) CONFIG_FILES="$CONFIG_FILES imlib2-config" ;;
+ "README" ) CONFIG_FILES="$CONFIG_FILES README" ;;
+ "imlib2.spec" ) CONFIG_FILES="$CONFIG_FILES imlib2.spec" ;;
+- "debian/changelog" ) CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+diff -upNr imlib2.old/configure.in imlib2.new/configure.in
+--- imlib2.old/configure.in 2007-12-10 21:58:54.000000000 -0200
++++ imlib2.new/configure.in 2007-12-10 22:00:22.000000000 -0200
+@@ -583,7 +583,6 @@ doc/Makefile
+ imlib2-config
+ README
+ imlib2.spec
+-debian/changelog
+ ],[
+ chmod +x imlib2-config
+ ])
-01_dont_overwrite_changelog
+01_dont_overwrite_changelog.diff
projects / maemo-efl / commitdiff