From 20b27d534833f78698ac15cd95c7bd8cfac07cce Mon Sep 17 00:00:00 2001 From: etrunko Date: Thu, 8 May 2008 20:49:50 +0000 Subject: [PATCH] Updated epsilon package --- trunk/epsilon/debian/changelog | 6 ++ trunk/epsilon/debian/control | 4 +- trunk/epsilon/debian/copyright | 57 ++++++++------ .../patches/01_dont_overwrite_changelog.diff | 24 +++--- .../debian/patches/02_epsilon_thumb_canola.diff | 80 +++++++++++--------- 5 files changed, 97 insertions(+), 74 deletions(-) diff --git a/trunk/epsilon/debian/changelog b/trunk/epsilon/debian/changelog index 782aa9b..f72b404 100644 --- a/trunk/epsilon/debian/changelog +++ b/trunk/epsilon/debian/changelog @@ -1,3 +1,9 @@ +epsilon (0.3.0.012-maemo3) unstable; urgency=low + + * New release. + + -- Eduardo Lima (Etrunko) Tue, 06 May 2008 15:49:22 -0300 + epsilon (0.3.0.012-maemo2) unstable; urgency=low * New release. diff --git a/trunk/epsilon/debian/control b/trunk/epsilon/debian/control index 9ecb23e..4be4228 100644 --- a/trunk/epsilon/debian/control +++ b/trunk/epsilon/debian/control @@ -2,7 +2,7 @@ Source: epsilon Section: libs Priority: optional Maintainer: Maemo-EFL Team -Build-Depends: cdbs, quilt, debhelper, zlib1g-dev, libepeg0-dev (>= 0.9.1.042), libevas0-dev (>= 0.9.9.042-maemo2), libecore0-dev (>= 0.9.9.042-maemo2), libedje0-dev (>= 0.5.0.042-maemo3), libimlib2-dev (>= 1.4.1.000), libpng12-dev +Build-Depends: cdbs, quilt, debhelper, zlib1g-dev, libepeg0-dev (>= 0.9.1.042-maemo2), libevas0-dev (>= 0.9.9.042-maemo3), libecore0-dev (>= 0.9.9.042-maemo3), libedje0-dev (>= 0.5.0.042-maemo4), libimlib2-dev (>= 1.4.1.000-maemo2), libpng12-dev Standards-Version: 3.7.2 Package: libepsilon0-dev @@ -17,7 +17,6 @@ Description: Enlightenment thumbnailing library development files libepeg. Package: libepsilon0 -Section: libs Architecture: any Depends: ${shlibs:Depends} Recommends: epsilon-bin @@ -28,7 +27,6 @@ Description: Enlightenment thumbnailing library API This package contains the shared library. Package: epsilon0-bin -Section: libs Architecture: any Depends: ${shlibs:Depends} Provides: epsilon-bin diff --git a/trunk/epsilon/debian/copyright b/trunk/epsilon/debian/copyright index c62ceff..b1aea45 100644 --- a/trunk/epsilon/debian/copyright +++ b/trunk/epsilon/debian/copyright @@ -1,34 +1,43 @@ -This package was debianized by Sytse Wielinga on -Thu, 4 Mar 2004 22:41:20 +0100 +This package was debianized by Eduardo Lima (Etrunko) on +Tue, 06 May 2008 15:49:22 -0300. The source is downloaded from the e17/libs/epsilon module of the enlightenment CVS tree. For more information, see: - http://www.enlightenment.org/cvs.html + http://www.enlightenment.org -Upstream Authors: Enlightenment team +Upstream Authors -License: - - Redistribution and use in source and binary forms, with or without - modification, are permitted under the terms of the BSD License. + Enlightenment team - 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. +Copyright: -On Debian systems, the complete text of the BSD License can be -found in `/usr/share/common-licenses/BSD'. + Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS) +License: -The Debian packaging is (C) 2007, E17 Debian Team and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. - + 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 of the Software, its documentation and marketing & publicity + materials, and acknowledgment shall be given in the documentation, + materials and software packages that this Software was used. + + 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 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. + +On Debian systems, the complete text of the BSD License can be found +in `/usr/share/common-licenses/BSD'. + +The Debian packaging is: + (C) 2006 2007,Debian Pkg-e Team + and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff b/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff index 62dcf18..cb18049 100644 --- a/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff +++ b/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff @@ -1,6 +1,6 @@ -diff -upNr epsilon/Makefile.am epsilon.new/Makefile.am ---- epsilon/Makefile.am 2008-02-18 20:36:22.000000000 -0200 -+++ epsilon.new/Makefile.am 2008-02-18 20:35:48.000000000 -0200 +diff -upr epsilon/Makefile.am epsilon.new/Makefile.am +--- epsilon/Makefile.am 2008-03-06 10:50:30.000000000 -0300 ++++ epsilon.new/Makefile.am 2008-05-08 14:01:33.000000000 -0300 @@ -9,10 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc epsilon.spec epsilon.pc depcomp @@ -13,9 +13,9 @@ diff -upNr epsilon/Makefile.am epsilon.new/Makefile.am pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = epsilon.pc -diff -upNr epsilon/Makefile.in epsilon.new/Makefile.in ---- epsilon/Makefile.in 2008-02-18 20:36:22.000000000 -0200 -+++ epsilon.new/Makefile.in 2008-02-18 20:35:48.000000000 -0200 +diff -upr epsilon/Makefile.in epsilon.new/Makefile.in +--- epsilon/Makefile.in 2008-05-08 14:01:07.000000000 -0300 ++++ epsilon.new/Makefile.in 2008-05-08 14:01:50.000000000 -0300 @@ -35,10 +35,9 @@ host_triplet = @host@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ @@ -60,9 +60,9 @@ diff -upNr epsilon/Makefile.in epsilon.new/Makefile.in mostlyclean-libtool: -rm -f *.lo -diff -upNr epsilon/configure epsilon.new/configure ---- epsilon/configure 2008-02-18 20:36:22.000000000 -0200 -+++ epsilon.new/configure 2008-02-18 20:35:48.000000000 -0200 +diff -upr epsilon/configure epsilon.new/configure +--- epsilon/configure 2008-05-08 14:01:05.000000000 -0300 ++++ epsilon.new/configure 2008-05-08 14:01:48.000000000 -0300 @@ -15321,7 +15321,7 @@ requirements="imlib2 evas ecore-evas eco ##################################################################### ## Output @@ -80,9 +80,9 @@ diff -upNr epsilon/configure epsilon.new/configure *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -diff -upNr epsilon/configure.in epsilon.new/configure.in ---- epsilon/configure.in 2008-02-18 20:36:22.000000000 -0200 -+++ epsilon.new/configure.in 2008-02-18 20:35:48.000000000 -0200 +diff -upr epsilon/configure.in epsilon.new/configure.in +--- epsilon/configure.in 2008-03-06 10:50:30.000000000 -0300 ++++ epsilon.new/configure.in 2008-05-08 14:01:39.000000000 -0300 @@ -106,7 +106,6 @@ src/lib/Makefile src/lib/exiftags/Makefile src/bin/Makefile diff --git a/trunk/epsilon/debian/patches/02_epsilon_thumb_canola.diff b/trunk/epsilon/debian/patches/02_epsilon_thumb_canola.diff index 9009ef5..2faff3c 100644 --- a/trunk/epsilon/debian/patches/02_epsilon_thumb_canola.diff +++ b/trunk/epsilon/debian/patches/02_epsilon_thumb_canola.diff @@ -1,6 +1,6 @@ -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 +diff -upNr epsilon/src/lib/Epsilon.c epsilon.new/src/lib/Epsilon.c +--- epsilon/src/lib/Epsilon.c 2008-03-06 10:50:30.000000000 -0300 ++++ epsilon.new/src/lib/Epsilon.c 2008-05-08 13:53:26.000000000 -0300 @@ -23,6 +23,9 @@ #ifdef HAVE_EPEG_H #include @@ -55,19 +55,6 @@ diff -upNr epsilon.orig/src/lib/Epsilon.c epsilon/src/lib/Epsilon.c 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); @@ -90,16 +77,39 @@ diff -upNr epsilon.orig/src/lib/Epsilon.c epsilon/src/lib/Epsilon.c } 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 +@@ -695,18 +712,19 @@ epsilon_generate (Epsilon * e) + #ifdef HAVE_PNG_H + if (tmp) + { +- iw = imlib_image_get_width (); +- ih = imlib_image_get_height (); +- if (iw > ih) +- { +- th = e->th * ((double) ih / (double) iw); +- if (th < 1) th = 1; +- } +- else +- { +- tw = e->tw * ((double) iw / (double) ih); +- if (tw < 1) tw = 1; +- } ++ iw = imlib_image_get_width (); ++ ih = imlib_image_get_height (); ++ /* XXX - hack to force fixed height in case of tw != th (canola) */ ++ if (iw > ih && tw == th) ++ { ++ th = ((unsigned long) e->tw * ih) / iw; ++ if (th < 1) th = 1; ++ } ++ else ++ { ++ tw = ((unsigned long) e->th * iw) / ih; ++ if (tw < 1) tw = 1; ++ } + imlib_context_set_cliprect (0, 0, tw, th); + if ((src = imlib_create_cropped_scaled_image (0, 0, iw, ih, tw, th))) + { +@@ -749,7 +767,11 @@ epsilon_thumb_size(Epsilon *e, Epsilon_T e->tw = THUMB_SIZE_LARGE; e->th = THUMB_SIZE_LARGE; break; @@ -112,9 +122,9 @@ diff -upNr epsilon.orig/src/lib/Epsilon.c epsilon/src/lib/Epsilon.c } -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 +diff -upNr epsilon/src/lib/Epsilon.h epsilon.new/src/lib/Epsilon.h +--- epsilon/src/lib/Epsilon.h 2008-03-06 10:50:30.000000000 -0300 ++++ epsilon.new/src/lib/Epsilon.h 2008-05-08 13:53:26.000000000 -0300 @@ -58,7 +58,8 @@ typedef struct _Epsilon_Info Epsilon_Inf enum _Epsilon_Thumb_Size { @@ -125,9 +135,9 @@ diff -upNr epsilon.orig/src/lib/Epsilon.h epsilon/src/lib/Epsilon.h }; 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 +diff -upNr epsilon/src/lib/epsilon_thumb.c epsilon.new/src/lib/epsilon_thumb.c +--- epsilon/src/lib/epsilon_thumb.c 2008-03-06 10:50:30.000000000 -0300 ++++ epsilon.new/src/lib/epsilon_thumb.c 2008-05-08 13:53:26.000000000 -0300 @@ -218,6 +218,9 @@ epsilon_cb_server_data(void *data, int t if (e->server != epsilon_server) return 1; @@ -138,9 +148,9 @@ diff -upNr epsilon.orig/src/lib/epsilon_thumb.c epsilon/src/lib/epsilon_thumb.c 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 +diff -upNr epsilon/src/lib/exiftags/canon.c epsilon.new/src/lib/exiftags/canon.c +--- epsilon/src/lib/exiftags/canon.c 2008-03-06 10:50:30.000000000 -0300 ++++ epsilon.new/src/lib/exiftags/canon.c 2008-05-08 13:53:26.000000000 -0300 @@ -52,7 +52,7 @@ struct ccstm { int32_t val; -- 1.7.9.5