From: etrunko Date: Thu, 8 May 2008 17:16:27 +0000 (+0000) Subject: Updated imlib2 package X-Git-Url: http://vcs.maemo.org/git/?p=maemo-efl;a=commitdiff_plain;h=3966b1bf806e9e8dc901512705d81f7bae8e653f Updated imlib2 package --- diff --git a/trunk/imlib2/debian/changelog b/trunk/imlib2/debian/changelog index 9335c9c..624fca1 100644 --- a/trunk/imlib2/debian/changelog +++ b/trunk/imlib2/debian/changelog @@ -1,5 +1,11 @@ imlib2 (1.4.1.000-maemo1) unstable; urgency=low + * New release. + + -- Eduardo Lima (Etrunko) Tue, 06 May 2008 15:49:22 -0300 + +imlib2 (1.4.1.000-maemo1) unstable; urgency=low + * New upstream version. -- Eduardo Lima (Etrunko) Fri, 15 Feb 2008 12:04:42 -0200 diff --git a/trunk/imlib2/debian/control b/trunk/imlib2/debian/control index 75594f7..0a90cf4 100644 --- a/trunk/imlib2/debian/control +++ b/trunk/imlib2/debian/control @@ -5,6 +5,22 @@ Maintainer: Maemo-EFL Team Build-Depends: cdbs, libjpeg62-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, x11proto-core-dev | xlibs-dev, x11proto-xext-dev | xlibs-dev, libfreetype6-dev | freetype2-dev, libbz2-dev, automake1.7 | automaken, libtool, debhelper (>= 4.0) Standards-Version: 3.6.2.2 +#Package: imlib2-demo +#Architecture: any +#Section: graphics +#Depends: ${shlibs:Depends} +#Description: Imlib2 demo's +# This package contains two small Imlib2-based programs: a simple +# image viewer and a simple image conversion program. + +#Package: imlib2-test +#Architecture: any +#Section: graphics +#Depends: ${shlibs:Depends}, imlib2-demo (= ${Source-Version}) +#Description: Imlib2 test programs +# This package contains some, not generally usable, test programs +# for Imlib2. + Package: libimlib2 Section: libs Architecture: any @@ -21,7 +37,6 @@ Description: Powerful image loading and rendering library Package: libimlib2-dev Architecture: any Section: libdevel -Architecture: any Depends: libimlib2 (= ${Source-Version}), libjpeg62-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, x11proto-core-dev | xlibs-dev, x11proto-xext-dev | xlibs-dev, libfreetype6-dev | freetype2-dev, libbz2-dev Description: Imlib2 headers, static libraries and documentation Headers, static libraries and documentation for Imlib2. diff --git a/trunk/imlib2/debian/copyright b/trunk/imlib2/debian/copyright index 25d1164..387faad 100644 --- a/trunk/imlib2/debian/copyright +++ b/trunk/imlib2/debian/copyright @@ -1,32 +1,42 @@ -This package was debianized by Laurence J. Lane on -Sat, 28 Oct 2000 17:56:46 -0400. +This package was debianized by Eduardo Lima (Etrunko) on +Tue, 06 May 2008 15:49:22 -0300. The source code is from the e17/libs/imlib2 module of the enlightenment CVS tree. For more information, see: - http://www.enlightenment.org/cvs.html + http://www.enlightenment.org -Upstream Author: Carsten Haitzler +Upstream Authors: + + Carsten Haitzler Copyright: -Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS) - -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. + Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS) +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 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/imlib2/debian/libimlib2-dev.install b/trunk/imlib2/debian/libimlib2-dev.install index cad295b..55c6f3f 100644 --- a/trunk/imlib2/debian/libimlib2-dev.install +++ b/trunk/imlib2/debian/libimlib2-dev.install @@ -1,10 +1,6 @@ debian/tmp/usr/bin/imlib2-config debian/tmp/usr/lib/pkgconfig/* -debian/tmp/usr/include/ +debian/tmp/usr/include debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.a debian/tmp/usr/lib/*.la -debian/tmp/usr/lib/imlib2/loaders/*.a -debian/tmp/usr/lib/imlib2/loaders/*.la -debian/tmp/usr/lib/imlib2/filters/*.a -debian/tmp/usr/lib/imlib2/filters/*.la diff --git a/trunk/imlib2/debian/libimlib2.install b/trunk/imlib2/debian/libimlib2.install index 6dd7443..c74fded 100644 --- a/trunk/imlib2/debian/libimlib2.install +++ b/trunk/imlib2/debian/libimlib2.install @@ -1,3 +1,2 @@ debian/tmp/usr/lib/*.so.* -debian/tmp/usr/lib/imlib2/loaders/*.so -debian/tmp/usr/lib/imlib2/filters/*.so +debian/tmp/usr/lib/imlib2/*/*.so diff --git a/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff b/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff index b3dc47f..fcd736e 100644 --- a/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff +++ b/trunk/imlib2/debian/patches/01_dont_overwrite_changelog.diff @@ -1,7 +1,6 @@ -Files imlib2/.git/index and /tmp/imlib2/.git/index differ -diff -upNr imlib2/Makefile.am /tmp/imlib2/Makefile.am ---- imlib2/Makefile.am 2008-02-18 18:13:44.000000000 -0200 -+++ imlib2/Makefile.am 2008-02-18 18:12:36.000000000 -0200 +diff -upr imlib2/Makefile.am imlib2.new/Makefile.am +--- imlib2/Makefile.am 2008-03-06 10:50:22.000000000 -0300 ++++ imlib2.new/Makefile.am 2008-05-08 11:00:05.000000000 -0300 @@ -9,8 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc imlib2_docs.tar.gz imlib2.c \ README \ @@ -32,9 +31,9 @@ diff -upNr imlib2/Makefile.am /tmp/imlib2/Makefile.am pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = imlib2.pc -diff -upNr imlib2/Makefile.in /tmp/imlib2/Makefile.in ---- imlib2/Makefile.in 2008-02-18 18:14:10.000000000 -0200 -+++ imlib2/Makefile.in 2008-02-18 18:13:15.000000000 -0200 +diff -upr imlib2/Makefile.in imlib2.new/Makefile.in +--- imlib2/Makefile.in 2008-05-08 10:59:15.000000000 -0300 ++++ imlib2.new/Makefile.in 2008-05-08 11:00:27.000000000 -0300 @@ -38,9 +38,9 @@ DIST_COMMON = README $(am__configure_dep $(srcdir)/Makefile.in $(srcdir)/README.in \ $(srcdir)/config.h.in $(srcdir)/imlib2-config.in \ @@ -96,10 +95,10 @@ diff -upNr imlib2/Makefile.in /tmp/imlib2/Makefile.in install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" -diff -upNr imlib2/configure /tmp/imlib2/configure ---- imlib2/configure 2008-02-18 18:14:07.000000000 -0200 -+++ imlib2/configure 2008-02-18 18:13:11.000000000 -0200 -@@ -24303,7 +24303,7 @@ if test "x$enable_visibility_hiding" = x +diff -upr imlib2/configure imlib2.new/configure +--- imlib2/configure 2008-05-08 10:59:12.000000000 -0300 ++++ imlib2.new/configure 2008-05-08 11:00:24.000000000 -0300 +@@ -24568,7 +24568,7 @@ if test "x$enable_visibility_hiding" = x CPPFLAGS="$CPPFLAGS -fvisibility=hidden" fi @@ -108,7 +107,7 @@ diff -upNr imlib2/configure /tmp/imlib2/configure ac_config_commands="$ac_config_commands default" -@@ -24985,7 +24985,6 @@ do +@@ -25243,7 +25243,6 @@ do "imlib2-config") CONFIG_FILES="$CONFIG_FILES imlib2-config" ;; "README") CONFIG_FILES="$CONFIG_FILES README" ;; "imlib2.spec") CONFIG_FILES="$CONFIG_FILES imlib2.spec" ;; @@ -116,10 +115,10 @@ diff -upNr imlib2/configure /tmp/imlib2/configure "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -diff -upNr imlib2/configure.in /tmp/imlib2/configure.in ---- imlib2/configure.in 2008-02-18 18:13:44.000000000 -0200 -+++ imlib2/configure.in 2008-02-18 18:12:36.000000000 -0200 -@@ -586,7 +586,6 @@ doc/Makefile +diff -upr imlib2/configure.in imlib2.new/configure.in +--- imlib2/configure.in 2008-05-05 16:45:04.000000000 -0300 ++++ imlib2.new/configure.in 2008-05-08 11:00:13.000000000 -0300 +@@ -584,7 +584,6 @@ doc/Makefile imlib2-config README imlib2.spec diff --git a/trunk/imlib2/debian/patches/02_missing_png_symbol.patch b/trunk/imlib2/debian/patches/02_missing_png_symbol.patch new file mode 100644 index 0000000..aa4c335 --- /dev/null +++ b/trunk/imlib2/debian/patches/02_missing_png_symbol.patch @@ -0,0 +1,23 @@ +Index: src/modules/loaders/loader_png.c +=================================================================== +RCS file: /var/cvs/e/e17/libs/imlib2/src/modules/loaders/loader_png.c,v +retrieving revision 1.5 +diff -u -p -r1.5 loader_png.c +--- src/modules/loaders/loader_png.c 25 Aug 2007 02:33:51 -0000 1.5 ++++ src/modules/loaders/loader_png.c 7 May 2008 18:31:10 -0000 +@@ -112,9 +112,15 @@ load(ImlibImage * im, ImlibProgressFunct + if ((color_type == PNG_COLOR_TYPE_GRAY) || + (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) + { ++ /* XXX HACK avoid calling symbol not available in osso libpng */ ++ fclose(f); ++ return 0; ++ ++ /* + png_set_gray_to_rgb(png_ptr); + if (bit_depth < 8) + png_set_expand_gray_1_2_4_to_8(png_ptr); ++ */ + } + /* expand transparency entry -> alpha channel if present */ + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) diff --git a/trunk/imlib2/debian/patches/series b/trunk/imlib2/debian/patches/series index 93ff346..5a80c56 100644 --- a/trunk/imlib2/debian/patches/series +++ b/trunk/imlib2/debian/patches/series @@ -1 +1,2 @@ 01_dont_overwrite_changelog.diff +02_missing_png_symbol.patch