From c516777e4a1390f5e5472bdcbe44d216a6c78ff5 Mon Sep 17 00:00:00 2001 From: lfelipe Date: Thu, 8 Jan 2009 15:29:07 +0000 Subject: [PATCH] Updated EFL to svn rev38480 and added new package Eina (which is a dependency for almost all the other efl packages). --- trunk/e_dbus/debian/changelog | 4 +- trunk/e_dbus/debian/control.in | 4 +- .../debian/patches/01-dbus-signatures-h.diff | 90 +++++++++++++++++++ .../debian/patches/01-e_dbus-bora-compile-fix.diff | 92 ------------------- .../debian/patches/02-dbus-signatures-h.diff | 90 ------------------- trunk/e_dbus/debian/patches/series | 3 +- trunk/ecore/debian/changelog | 4 +- trunk/ecore/debian/control.in | 38 ++++---- trunk/edje/debian/changelog | 6 +- trunk/edje/debian/control.in | 4 +- trunk/eet/debian/changelog | 4 +- trunk/efl-core/debian/changelog | 6 +- trunk/efl-core/debian/control.in | 4 +- trunk/eina/debian/changelog | 6 ++ trunk/eina/debian/compat | 1 + trunk/eina/debian/control | 70 +++++++++++++++ trunk/eina/debian/copyright | 36 ++++++++ trunk/eina/debian/libeina-dev.install | 4 + trunk/eina/debian/libeina0.install | 2 + trunk/eina/debian/rules | 48 ++++++++++ trunk/embryo/debian/changelog | 7 +- trunk/epeg/debian/changelog | 4 +- trunk/epsilon/debian/changelog | 4 +- .../patches/01_dont_overwrite_changelog.diff | 93 -------------------- trunk/epsilon/debian/patches/series | 1 - trunk/etk/debian/changelog | 4 +- trunk/etk/debian/control.in | 4 +- .../patches/01_dont_overwrite_changelog.diff | 89 ------------------- trunk/etk/debian/patches/series | 1 - trunk/evas/debian/changelog | 4 +- trunk/evas/debian/control.in | 4 +- trunk/python-e_dbus/debian/changelog | 2 +- trunk/python-ecore/debian/changelog | 2 +- trunk/python-edje/debian/changelog | 2 +- trunk/python-efl-core/debian/changelog | 2 +- trunk/python-epsilon/debian/changelog | 2 +- .../patches/01-python-epsilon-thumb-canola.diff | 87 ------------------ trunk/python-epsilon/debian/patches/series | 1 - trunk/python-etk/debian/changelog | 2 +- trunk/python-evas/debian/changelog | 2 +- trunk/scripts/build.sh | 2 +- trunk/scripts/mktarball-efl.sh | 2 +- trunk/scripts/var-definitions.sh | 2 +- 43 files changed, 320 insertions(+), 519 deletions(-) create mode 100644 trunk/e_dbus/debian/patches/01-dbus-signatures-h.diff delete mode 100644 trunk/e_dbus/debian/patches/01-e_dbus-bora-compile-fix.diff delete mode 100644 trunk/e_dbus/debian/patches/02-dbus-signatures-h.diff create mode 100644 trunk/eina/debian/changelog create mode 100644 trunk/eina/debian/compat create mode 100644 trunk/eina/debian/control create mode 100644 trunk/eina/debian/copyright create mode 100644 trunk/eina/debian/libeina-dev.install create mode 100644 trunk/eina/debian/libeina0.install create mode 100755 trunk/eina/debian/rules delete mode 100644 trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff delete mode 100644 trunk/epsilon/debian/patches/series delete mode 100644 trunk/etk/debian/patches/01_dont_overwrite_changelog.diff delete mode 100644 trunk/etk/debian/patches/series delete mode 100644 trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.diff delete mode 100644 trunk/python-epsilon/debian/patches/series diff --git a/trunk/e_dbus/debian/changelog b/trunk/e_dbus/debian/changelog index 3e7199a..252171e 100644 --- a/trunk/e_dbus/debian/changelog +++ b/trunk/e_dbus/debian/changelog @@ -1,8 +1,8 @@ -e-dbus (0.5.0.043+svn36098-maemo1) unstable; urgency=low +e-dbus (0.5.0.050+svn38480-maemo1) unstable; urgency=low * Synched with svn repository. - -- Eduardo Rocha Thu, 11 Sep 2008 16:00:00 -0300 + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 e-dbus (0.1.0.042-maemo5) unstable; urgency=low diff --git a/trunk/e_dbus/debian/control.in b/trunk/e_dbus/debian/control.in index 243b8f5..2d5cb29 100644 --- a/trunk/e_dbus/debian/control.in +++ b/trunk/e_dbus/debian/control.in @@ -2,13 +2,13 @@ Source: e-dbus Section: libs Priority: optional Maintainer: Maemo-EFL Team -Build-Depends: cdbs, debhelper (>= 4), libecore0-dev (>= @ECORE_VERSION@), libdbus-1-dev +Build-Depends: cdbs, debhelper (>= 4), libecore0-dev (>= @ECORE_VERSION@), libdbus-1-dev, libeina-dev (>= @EINA_VERSION@) Standards-Version: 3.7.2 Package: libedbus0-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, libedbus0 (= ${Source-Version}), libecore0-dev (>= @ECORE_VERSION@), libdbus-1-dev +Depends: ${shlibs:Depends}, libedbus0 (= ${Source-Version}), libecore0-dev (>= @ECORE_VERSION@), libdbus-1-dev, libeina0 (>= @EINA_VERSION@) Provides: libedbus-dev Description: D-Bus and HAL wrapper libraries for use with the EFL - Development files Wrappers around D-Bus to ease integrating D-Bus with EFL based applications. diff --git a/trunk/e_dbus/debian/patches/01-dbus-signatures-h.diff b/trunk/e_dbus/debian/patches/01-dbus-signatures-h.diff new file mode 100644 index 0000000..e987563 --- /dev/null +++ b/trunk/e_dbus/debian/patches/01-dbus-signatures-h.diff @@ -0,0 +1,90 @@ +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 ++#include ++#include ++ ++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 + #include + ++#include "dbus-signature.h" ++ + static E_DBus_Interface *introspectable_interface = NULL; + static E_DBus_Interface *properties_interface = NULL; + diff --git a/trunk/e_dbus/debian/patches/01-e_dbus-bora-compile-fix.diff b/trunk/e_dbus/debian/patches/01-e_dbus-bora-compile-fix.diff deleted file mode 100644 index fcf4dc6..0000000 --- a/trunk/e_dbus/debian/patches/01-e_dbus-bora-compile-fix.diff +++ /dev/null @@ -1,92 +0,0 @@ -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 - ]) - diff --git a/trunk/e_dbus/debian/patches/02-dbus-signatures-h.diff b/trunk/e_dbus/debian/patches/02-dbus-signatures-h.diff deleted file mode 100644 index e987563..0000000 --- a/trunk/e_dbus/debian/patches/02-dbus-signatures-h.diff +++ /dev/null @@ -1,90 +0,0 @@ -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 -+#include -+#include -+ -+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 - #include - -+#include "dbus-signature.h" -+ - static E_DBus_Interface *introspectable_interface = NULL; - static E_DBus_Interface *properties_interface = NULL; - diff --git a/trunk/e_dbus/debian/patches/series b/trunk/e_dbus/debian/patches/series index 35d4a17..326e5f9 100644 --- a/trunk/e_dbus/debian/patches/series +++ b/trunk/e_dbus/debian/patches/series @@ -1,2 +1 @@ -01-e_dbus-bora-compile-fix.diff -02-dbus-signatures-h.diff +01-dbus-signatures-h.diff diff --git a/trunk/ecore/debian/changelog b/trunk/ecore/debian/changelog index 77c0bf4..79b5090 100644 --- a/trunk/ecore/debian/changelog +++ b/trunk/ecore/debian/changelog @@ -1,8 +1,8 @@ -ecore (0.9.9.043+svn36098-maemo1) unstable; urgency=low +ecore (0.9.9.050+svn38480-maemo1) unstable; urgency=low * Synched with svn repository - -- Eduardo Rocha Thu, 11 Sep 2008 16:00:00 -0300 + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 ecore (0.9.9.042-maemo5) unstable; urgency=low diff --git a/trunk/ecore/debian/control.in b/trunk/ecore/debian/control.in index 71be401..50e328a 100644 --- a/trunk/ecore/debian/control.in +++ b/trunk/ecore/debian/control.in @@ -2,13 +2,13 @@ Source: ecore Section: libs Priority: optional Maintainer: Maemo-EFL Team -Build-Depends: cdbs, debhelper (>= 4), libeet1-dev (>= @EET_VERSION@), libevas0-dev (>= @EVAS_VERSION@), libssl-dev, libcurl3-dev, libcurl3-openssl-dev, libxcursor-dev, x-dev | libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, libfreetype6-dev, libjpeg62-dev +Build-Depends: cdbs, debhelper (>= 4), libeina-dev (>= @EINA_VERSION@), libeet1-dev (>= @EET_VERSION@), libevas0-dev (>= @EVAS_VERSION@), libssl-dev, libcurl3-dev, libcurl3-openssl-dev, libxcursor-dev, x-dev | libx11-dev, libxrender-dev, libxrandr-dev, libxext-dev, libfreetype6-dev, libjpeg62-dev Standards-Version: 3.7.2 Package: libecore0 Architecture: any Provides: libecore -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, libeina0 (>= @EINA_VERSION@) Description: Core abstraction layer for enlightenment DR 0.17 This is the core event abstraction layer and X abstraction layer that makes doing selections, Xdnd, general X stuff, and event loops, timeouts and idle @@ -248,20 +248,20 @@ Description: Ecore headers, static libraries and documentation # This package includes: # - ecore_config: allows creation/editing of ecore_config databases -#Package: libecore0-dbg -#Architecture: any -#Section: libdevel -#Priority: extra -#Depends: libecore0 (= ${Source-Version}) -#Provides: libecore-dbg -#Description: Core abstraction layer for enlightenment DR 0.17 -# This is the core event abstraction layer and X abstraction layer that makes -# doing selections, Xdnd, general X stuff, and event loops, timeouts and idle -# handlers fast, optimized, and convenient. It's a separate library so anyone -# can make use of the work put into Ecore to make this job easy for -# applications -# . -# This package contains unstripped shared libraries. It is provided primarily -# to provide a backtrace with names in a debugger, this makes it somewhat easier -# to interpret core dumps. The libraries are installed in /usr/lib/debug and -# are automatically used by gdb. +Package: libecore0-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: libecore0 (= ${Source-Version}) +Provides: libecore-dbg +Description: Core abstraction layer for enlightenment DR 0.17 + This is the core event abstraction layer and X abstraction layer that makes + doing selections, Xdnd, general X stuff, and event loops, timeouts and idle + handlers fast, optimized, and convenient. It's a separate library so anyone + can make use of the work put into Ecore to make this job easy for + applications + . + This package contains unstripped shared libraries. It is provided primarily + to provide a backtrace with names in a debugger, this makes it somewhat easier + to interpret core dumps. The libraries are installed in /usr/lib/debug and + are automatically used by gdb. diff --git a/trunk/edje/debian/changelog b/trunk/edje/debian/changelog index 0426eb5..9eceef8 100644 --- a/trunk/edje/debian/changelog +++ b/trunk/edje/debian/changelog @@ -1,8 +1,8 @@ -edje (0.9.9.043+svn36098-maemo2) unstable; urgency=low +edje (0.9.9.050+svn38480-maemo1) unstable; urgency=low - * Updated embryo dependency info. + * Synched with newest svn version - -- Alvaro Fagner R. da Silva Fri, 26 Sep 2008 11:18:49 -0400 + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 edje (0.9.9.043+svn36098-maemo1) unstable; urgency=low diff --git a/trunk/edje/debian/control.in b/trunk/edje/debian/control.in index 5d0585f..7533a21 100644 --- a/trunk/edje/debian/control.in +++ b/trunk/edje/debian/control.in @@ -3,13 +3,13 @@ Section: libs Priority: optional Maintainer: Maemo-EFL Team Suggests: edje0-bin -Build-Depends: debhelper (>> 4.0.0), cdbs (>= 0.4.3-1.1), automake1.7 | automaken, libtool, libeet1-dev (>= @EET_VERSION@), libecore0-dev (>= @ECORE_VERSION@), libevas0-dev (>= @EVAS_VERSION@), libembryo0-dev (>= @EMBRYO_VERSION@) +Build-Depends: debhelper (>> 4.0.0), cdbs (>= 0.4.3-1.1), automake1.7 | automaken, libtool, libeet1-dev (>= @EET_VERSION@), libecore0-dev (>= @ECORE_VERSION@), libevas0-dev (>= @EVAS_VERSION@), libembryo0-dev (>= @EMBRYO_VERSION@), libeina-dev (>= @EINA_VERSION@) Standards-Version: 3.7.2 Package: edje0-bin Architecture: any Section: graphics -Depends: ${shlibs:Depends}, libedje0 (= ${Source-Version}), embryo0-bin (>= @EMBRYO_VERSION@), libevas0-loader-png (>= @EVAS_VERSION@), libevas0-loader-jpeg (>= @EVAS_VERSION@), libevas0-engine-buffer (>= @EVAS_VERSION@) +Depends: ${shlibs:Depends}, libedje0 (= ${Source-Version}), embryo0-bin (>= @EMBRYO_VERSION@), libevas0-loader-png (>= @EVAS_VERSION@), libevas0-loader-jpeg (>= @EVAS_VERSION@), libevas0-engine-buffer (>= @EVAS_VERSION@), libeina0 (>= @EINA_VERSION@) Provides: edje-bin Description: Various binaries for use with Edje Edje is a graphical layout and animation library for animated resizable, diff --git a/trunk/eet/debian/changelog b/trunk/eet/debian/changelog index 12dafe0..45f33bb 100644 --- a/trunk/eet/debian/changelog +++ b/trunk/eet/debian/changelog @@ -1,8 +1,8 @@ -eet (1.0.1+svn36098-maemo1) unstable; urgency=low +eet (1.1.0+svn38480-maemo1) unstable; urgency=low * Synched with svn repository. - -- Eduardo Rocha Thu, 11 Sep 2008 16:30:00 -0300 + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 eet (1.0.0-maemo2) unstable; urgency=low diff --git a/trunk/efl-core/debian/changelog b/trunk/efl-core/debian/changelog index a15d099..f19bee1 100644 --- a/trunk/efl-core/debian/changelog +++ b/trunk/efl-core/debian/changelog @@ -1,8 +1,8 @@ -efl-core (0.9.99.043+svn36098-maemo3) unstable; urgency=low +efl-core (0.9.99.050+svn38480-maemo1) unstable; urgency=low - * Updated embryo and edje dependency info. + * Synched with latest svn - -- Alvaro Fagner R. da Silva Fri, 26 Sep 2008 11:20:33 -0400 + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 efl-core (0.9.99.043+svn36098-maemo2) unstable; urgency=low diff --git a/trunk/efl-core/debian/control.in b/trunk/efl-core/debian/control.in index f41bde6..48c792c 100644 --- a/trunk/efl-core/debian/control.in +++ b/trunk/efl-core/debian/control.in @@ -7,7 +7,7 @@ Standards-Version: 3.6.1 Package: efl-core Priority: optional Architecture: all -Depends: libeet1 (>= @EET_VERSION@), libevas0 (>= @EVAS_VERSION@), libevas0-all (>= @EVAS_VERSION@), libecore0 (>= @ECORE_VERSION@), libecore0-all (>= @ECORE_VERSION@), libembryo0 (>= @EMBRYO_VERSION@), libedje0 (>= @EDJE_VERSION@), +Depends: libeet1 (>= @EET_VERSION@), libevas0 (>= @EVAS_VERSION@), libevas0-all (>= @EVAS_VERSION@), libecore0 (>= @ECORE_VERSION@), libecore0-all (>= @ECORE_VERSION@), libembryo0 (>= @EMBRYO_VERSION@), libedje0 (>= @EDJE_VERSION@), libeina0 (>= @EINA_VERSION@), libepsilon0 (>= @EPSILON_VERSION@), libetk0 (>= @ETK_VERSION@), libetk0-engine-all (>= @ETK_VERSION@), libedbus0 (>= @E_DBUS_VERSION@) Description: Enlightenment Foundation Libraries Core metapackage This metapackage brings Enlightenment Foundation Core Libraries @@ -19,7 +19,7 @@ Package: efl-core-dev Priority: optional Architecture: all Depends: efl-core (= ${Source-Version}), libeet1-dev (>= @EET_VERSION@), libevas0-dev (>= @EVAS_VERSION@), libecore0-dev (>= @ECORE_VERSION@), libembryo0-dev (>= @EMBRYO_VERSION@), libedje0-dev (>= @EDJE_VERSION@), - libepsilon0-dev (>= @EPSILON_VERSION@), libetk0-dev (>= @ETK_VERSION@), libedbus0-dev (>= @E_DBUS_VERSION@) + libepsilon0-dev (>= @EPSILON_VERSION@), libetk0-dev (>= @ETK_VERSION@), libedbus0-dev (>= @E_DBUS_VERSION@), libeina-dev (>= @EINA_VERSION@) Description: Enlightenment Foundation Libraries Core metapackage This metapackage brings Enlightenment Foundation Core Libraries to the system diff --git a/trunk/eina/debian/changelog b/trunk/eina/debian/changelog new file mode 100644 index 0000000..333a5a5 --- /dev/null +++ b/trunk/eina/debian/changelog @@ -0,0 +1,6 @@ +eina (0.0.1+svn38480-maemo1) unstable; urgency=low + + * New EFL dependency. + + -- Luís Felipe Strano Moraes Wed, 10 Dec 2008 14:30:00 -0300 + diff --git a/trunk/eina/debian/compat b/trunk/eina/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/trunk/eina/debian/compat @@ -0,0 +1 @@ +5 diff --git a/trunk/eina/debian/control b/trunk/eina/debian/control new file mode 100644 index 0000000..ad4da88 --- /dev/null +++ b/trunk/eina/debian/control @@ -0,0 +1,70 @@ +Source: eina +Section: libs +Priority: optional +Maintainer: Falko Schmidt +Build-Depends: debhelper (>= 5), cdbs, automake1.7 | automaken, libtool, pkg-config +Standards-Version: 3.7.3 +Homepage: http://www.enlightenment.org + +Package: libeina-dev +Section: libdevel +Architecture: any +Depends: libeina0 (= ${Source-Version}) +Description: Enlightenment DR17 file chunk reading/writing library development files + Eina is a multi-platform library that provides optimized data types and a few + tools. It supports the following data types: + Containers: + o Array: an array + o Hash Table: a hash table + o Inlined List: an list with functions inlined + o List: a single-linked list + o Red-Black Tree: a tree + o Access Content types + + Accessor: can access items of a container randomly + + Iterator: can access items of a container sequentially + Stringshare. + . + This package contains headers and static libraries for development with + libeina. + +Package: libeina0 +Architecture: any +Depends: ${shlibs:Depends} +Provides: libeina +Description: Enlightenment DR17 file chunk reading/writing library + Eina is a multi-platform library that provides optimized data types and a few + tools. It supports the following data types: + Containers: + o Array: an array + o Hash Table: a hash table + o Inlined List: an list with functions inlined + o List: a single-linked list + o Red-Black Tree: a tree + o Access Content types + + Accessor: can access items of a container randomly + + Iterator: can access items of a container sequentially + Stringshare. + +Package: libeina-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: libeina0 (= ${binary:Version}) +Description: Enlightenment DR17 file chunk reading/writing library - debug symbols + Eina is a multi-platform library that provides optimized data types and a few + tools. It supports the following data types: + Containers: + o Array: an array + o Hash Table: a hash table + o Inlined List: an list with functions inlined + o List: a single-linked list + o Red-Black Tree: a tree + o Access Content types + + Accessor: can access items of a container randomly + + Iterator: can access items of a container sequentially + Stringshare. + . + This package contains unstripped shared libraries. It is provided primarily + to provide a backtrace with names in a debugger, this makes it somewhat easier + to interpret core dumps. The libraries are installed in /usr/lib/debug and + are automatically used by gdb. diff --git a/trunk/eina/debian/copyright b/trunk/eina/debian/copyright new file mode 100644 index 0000000..365af38 --- /dev/null +++ b/trunk/eina/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Falko Schmidt on +Tue, 21 Oct 2008 11:11:01 +0000. + +The source is downloaded from the trunk/eina module of the enlightenment SVN +tree. For more information, see: + + http://www.enlightenment.org + +Upstream Authors: Enlightenment team + +Copyright: + + Copyright (C) 2008 Jorge Luis Zapata and various contributors (see AUTHORS) + +License: + + This package 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; version 2 dated June, 1991. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +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/eina/debian/libeina-dev.install b/trunk/eina/debian/libeina-dev.install new file mode 100644 index 0000000..4a70bfa --- /dev/null +++ b/trunk/eina/debian/libeina-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/include/* +debian/tmp/usr/lib/lib*.a +debian/tmp/usr/lib/lib*.so diff --git a/trunk/eina/debian/libeina0.install b/trunk/eina/debian/libeina0.install new file mode 100644 index 0000000..560a64c --- /dev/null +++ b/trunk/eina/debian/libeina0.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/lib*.so.* +debian/tmp/usr/lib/eina/*/*.so diff --git a/trunk/eina/debian/rules b/trunk/eina/debian/rules new file mode 100755 index 0000000..15da726 --- /dev/null +++ b/trunk/eina/debian/rules @@ -0,0 +1,48 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --disable-magic-debug +DEB_MAKE_CLEAN_TARGET := clean +DEB_DH_STRIP_ARGS := --dbg-package=libeina-dbg +DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH) + +ifeq ($(DEB_BUILD_ARCH),armel) + COMMON_CFLAGS=-DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant + N770_CFLAGS=-mcpu=arm926ej-s + N8x0_CFLAGS=-mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s + ifneq ($(DEB_BUILD_OPTIONS),) + ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS))) + SPECIFIC_CFLAGS=$(N8x0_CFLAGS) + else + ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS))) + SPECIFIC_CFLAGS=$(N770_CFLAGS) + endif + endif + endif + ifeq ($(SPECIFIC_CFLAGS),) + ifeq (0,$(shell test -e /etc/osso_software_version; echo $$?)) + SW_VERSION?=$(shell cat /etc/osso_software_version|cut -d_ -f2) + ifneq (,$(findstring $(SW_VERSION),OSSO1.1 2008SE DIABLO)) + SPECIFIC_CFLAGS=$(N8x0_CFLAGS) + endif + endif + ifeq ($(SPECIFIC_CFLAGS),) + # Our last hope is to look at the value returned by `sb-conf current` + SB_CURRENT?=$(shell sb-conf current|cut -d_ -f1) + ifneq (,$(findstring $(SB_CURRENT),GREGALE BORA CHINOOK DIABLO)) + ifeq ($(SB_CURRENT),GREGALE) + SPECIFIC_CFLAGS=$(N770_CFLAGS) + else + SPECIFIC_CFLAGS=$(N8x0_CFLAGS) + endif + else + COMMON_CFLAGS= + endif + endif + endif +endif + +CFLAGS+=$(COMMON_CFLAGS) $(SPECIFIC_CFLAGS) + diff --git a/trunk/embryo/debian/changelog b/trunk/embryo/debian/changelog index 58fb303..563e310 100644 --- a/trunk/embryo/debian/changelog +++ b/trunk/embryo/debian/changelog @@ -1,9 +1,8 @@ -embryo (0.9.9.043+svn36098-maemo2) unstable; urgency=low +embryo (0.9.9.050+svn38480-maemo1) unstable; urgency=low - * Update version. - - -- Alvaro Fagner R. da Silva Fri, 26 Sep 2008 11:19:47 -0400 + * Synched with latest svn version. + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 embryo (0.9.9.043+svn36098-maemo1) unstable; urgency=low diff --git a/trunk/epeg/debian/changelog b/trunk/epeg/debian/changelog index 5d3253c..034dc67 100644 --- a/trunk/epeg/debian/changelog +++ b/trunk/epeg/debian/changelog @@ -1,8 +1,8 @@ epeg (0.9.1.042-maemo3) unstable; urgency=low - * debian/rules: Try to guess the target device in a bit more clever way. + * Synched with latest svn version - -- Eduardo Lima (Etrunko) Thu, 03 Jul 2008 16:05:28 -0300 + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 epeg (0.9.1.042-maemo2) unstable; urgency=low diff --git a/trunk/epsilon/debian/changelog b/trunk/epsilon/debian/changelog index 09377dc..c284449 100644 --- a/trunk/epsilon/debian/changelog +++ b/trunk/epsilon/debian/changelog @@ -1,8 +1,8 @@ -epsilon (0.3.0.012+svn36098-maemo1) unstable; urgency=low +epsilon (0.3.0.012+svn38480-maemo1) unstable; urgency=low * Synched with svn repository. - -- Eduardo Rocha Thu, 11 Sep 2008 16:40:00 -0300 + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 epsilon (0.3.0.012-maemo5) unstable; urgency=low diff --git a/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff b/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff deleted file mode 100644 index cf9909e..0000000 --- a/trunk/epsilon/debian/patches/01_dont_overwrite_changelog.diff +++ /dev/null @@ -1,93 +0,0 @@ -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 - - EXTRA_DIST = README AUTHORS COPYING epsilon.spec.in epsilon.spec gendoc \ -- Doxyfile debian/changelog debian/changelog.in debian/rules \ -- debian/copyright debian/control debian/libepsilon-bin.install \ -- debian/libepsilon0.install debian/libepsilon-dev.install \ -- epsilon.pc.in -+ Doxyfile epsilon.pc.in - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = epsilon.pc -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 \ - $(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 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -@@ -47,7 +46,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat - configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d - 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 \ -@@ -209,10 +208,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/libepsilon-bin.install \ -- debian/libepsilon0.install debian/libepsilon-dev.install \ -- epsilon.pc.in -+ Doxyfile epsilon.pc.in - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = epsilon.pc -@@ -256,8 +252,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 -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 - --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 -@@ -15925,7 +15925,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" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -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 - src/plugins/Makefile --debian/changelog - ]) - - diff --git a/trunk/epsilon/debian/patches/series b/trunk/epsilon/debian/patches/series deleted file mode 100644 index 93ff346..0000000 --- a/trunk/epsilon/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_dont_overwrite_changelog.diff diff --git a/trunk/etk/debian/changelog b/trunk/etk/debian/changelog index d80a354..4a16b57 100644 --- a/trunk/etk/debian/changelog +++ b/trunk/etk/debian/changelog @@ -1,8 +1,8 @@ -etk (0.1.0.042+svn36098-maemo1) unstable; urgency=low +etk (0.1.0.042+svn38480-maemo1) unstable; urgency=low * Synched with svn repository. - -- Eduardo Rocha Thu, 11 Sep 2008 16:40:00 -0300 + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 etk (0.1.0.042-maemo6) unstable; urgency=low diff --git a/trunk/etk/debian/control.in b/trunk/etk/debian/control.in index 3c41f7d..151451c 100644 --- a/trunk/etk/debian/control.in +++ b/trunk/etk/debian/control.in @@ -2,13 +2,13 @@ Source: etk Section: libs Priority: optional Maintainer: Maemo-EFL Team -Build-Depends: cdbs, quilt, debhelper (>= 4.0.0), autotools-dev, libevas0-dev (>= @EVAS_VERSION@), libecore0-dev (>= @ECORE_VERSION@), libedje0-dev (>= @EDJE_VERSION@), edje0-bin (>= @EDJE_VERSION@) +Build-Depends: cdbs, quilt, debhelper (>= 4.0.0), autotools-dev, libevas0-dev (>= @EVAS_VERSION@), libecore0-dev (>= @ECORE_VERSION@), libedje0-dev (>= @EDJE_VERSION@), edje0-bin (>= @EDJE_VERSION@), libeina-dev (>= @EINA_VERSION@) Standards-Version: 3.7.2 Package: libetk0 Architecture: any Section: libs -Depends: ${shlibs:Depends}, libevas0 (>= @EVAS_VERSION@), libecore0 (>= @ECORE_VERSION@), libecore0-imf-evas (>= @ECORE_VERSION@), libedje0 (>= @EDJE_VERSION@), libetk0-engine-evas-software-x11 (= ${Source-Version}), libetk0-engine-evas-software-x11-16 (= ${Source-Version}) +Depends: ${shlibs:Depends}, libevas0 (>= @EVAS_VERSION@), libecore0 (>= @ECORE_VERSION@), libecore0-imf-evas (>= @ECORE_VERSION@), libedje0 (>= @EDJE_VERSION@), libetk0-engine-evas-software-x11 (= ${Source-Version}), libetk0-engine-evas-software-x11-16 (= ${Source-Version}), libeina0 (>= @EINA_VERSION@) Provides: libetk Description: A widget toolkit based on the EFL ETK is a widget toolkit based on the enlightenment foundation libraries. diff --git a/trunk/etk/debian/patches/01_dont_overwrite_changelog.diff b/trunk/etk/debian/patches/01_dont_overwrite_changelog.diff deleted file mode 100644 index 377bd09..0000000 --- a/trunk/etk/debian/patches/01_dont_overwrite_changelog.diff +++ /dev/null @@ -1,89 +0,0 @@ -diff -upNr etk/Makefile.am etk.new/Makefile.am ---- etk/Makefile.am 2008-03-06 10:50:42.000000000 -0300 -+++ etk.new/Makefile.am 2008-05-08 16:03:06.000000000 -0300 -@@ -9,8 +9,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 = - -diff -upNr etk/Makefile.in etk.new/Makefile.in ---- etk/Makefile.in 2008-05-08 16:02:25.000000000 -0300 -+++ etk.new/Makefile.in 2008-05-08 16:03:35.000000000 -0300 -@@ -37,10 +37,9 @@ subdir = . - 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 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ -@@ -54,7 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat - configure.lineno config.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) -@@ -230,8 +229,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 = \ -@@ -313,8 +303,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)" -diff -upNr etk/configure etk.new/configure ---- etk/configure 2008-05-08 16:02:16.000000000 -0300 -+++ etk.new/configure 2008-05-08 16:03:26.000000000 -0300 -@@ -23839,7 +23839,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/test/Makefile data/test/clock/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/test/Makefile data/test/clock/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 -@@ -24514,7 +24514,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" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -diff -upNr etk/configure.in etk.new/configure.in ---- etk/configure.in 2008-05-05 16:45:30.000000000 -0300 -+++ etk.new/configure.in 2008-05-08 16:03:08.000000000 -0300 -@@ -230,7 +230,6 @@ data/icons/default/icons/48x48/status/Ma - data/icons/default/Makefile - po/Makefile - intl/Makefile --debian/changelog - ]) - - ##################################################################### diff --git a/trunk/etk/debian/patches/series b/trunk/etk/debian/patches/series deleted file mode 100644 index 93ff346..0000000 --- a/trunk/etk/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_dont_overwrite_changelog.diff diff --git a/trunk/evas/debian/changelog b/trunk/evas/debian/changelog index 0fdb2a5..bb6df15 100644 --- a/trunk/evas/debian/changelog +++ b/trunk/evas/debian/changelog @@ -1,8 +1,8 @@ -evas (0.9.9.043+svn36098-maemo1) unstable; urgency=low +evas (0.9.9.050+svn38480-maemo1) unstable; urgency=low * Synched with svn repository. - -- Eduardo Rocha Thu, 11 Sep 2008 16:42:00 -0300 + -- Luis Felipe Strano Moraes Wed, 10 Dec 2008 16:00:00 -0300 evas (0.9.9.042-maemo6) unstable; urgency=low diff --git a/trunk/evas/debian/control.in b/trunk/evas/debian/control.in index 0742e87..1662ed8 100644 --- a/trunk/evas/debian/control.in +++ b/trunk/evas/debian/control.in @@ -2,13 +2,13 @@ Source: evas Section: libs Priority: optional Maintainer: Maemo-EFL Team -Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool, libeet1-dev (>= @EET_VERSION@), libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | xlibs-dev, zlib1g, libjpeg62-dev, libungif4-dev, autotools-dev, x11proto-xext-dev, libxext-dev, libfontconfig1-dev +Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool, libeet1-dev (>= @EET_VERSION@), libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | xlibs-dev, zlib1g, libjpeg62-dev, libungif4-dev, autotools-dev, x11proto-xext-dev, libxext-dev, libfontconfig1-dev, libeina-dev (>= @EINA_VERSION@) Standards-Version: 3.7.2 #Homepage: http://www.enlightenment.org Package: libevas0 Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, libeina0 (>= @EINA_VERSION@) Suggests: libevas0-engines-all Provides: libevas Description: enlightenment advanced canvas library diff --git a/trunk/python-e_dbus/debian/changelog b/trunk/python-e_dbus/debian/changelog index bbf6063..0348e64 100644 --- a/trunk/python-e_dbus/debian/changelog +++ b/trunk/python-e_dbus/debian/changelog @@ -1,4 +1,4 @@ -python-edbus (0.3.0+svn36098-maemo1) unstable; urgency=low +python-edbus (0.3.0+svn38480-maemo1) unstable; urgency=low * Synched with svn repository. diff --git a/trunk/python-ecore/debian/changelog b/trunk/python-ecore/debian/changelog index 7b4d221..688c7e9 100644 --- a/trunk/python-ecore/debian/changelog +++ b/trunk/python-ecore/debian/changelog @@ -1,4 +1,4 @@ -python-ecore (0.3.0+svn36098-maemo2) unstable; urgency=low +python-ecore (0.3.0+svn38480-maemo1) unstable; urgency=low * Updated version. diff --git a/trunk/python-edje/debian/changelog b/trunk/python-edje/debian/changelog index 465f348..721a737 100644 --- a/trunk/python-edje/debian/changelog +++ b/trunk/python-edje/debian/changelog @@ -1,4 +1,4 @@ -python-edje (0.3.0+svn36098-maemo3) unstable; urgency=low +python-edje (0.3.0+svn38480-maemo1) unstable; urgency=low * Updated version. diff --git a/trunk/python-efl-core/debian/changelog b/trunk/python-efl-core/debian/changelog index 435064b..c378ae6 100644 --- a/trunk/python-efl-core/debian/changelog +++ b/trunk/python-efl-core/debian/changelog @@ -1,4 +1,4 @@ -python-efl-core (0.9.9.043+svn36098-maemo4) unstable; urgency=low +python-efl-core (0.9.9.050+svn38480-maemo1) unstable; urgency=low * Update package version. diff --git a/trunk/python-epsilon/debian/changelog b/trunk/python-epsilon/debian/changelog index 269d519..fadd073 100644 --- a/trunk/python-epsilon/debian/changelog +++ b/trunk/python-epsilon/debian/changelog @@ -1,4 +1,4 @@ -python-epsilon (0.3.0+svn36098-maemo1) unstable; urgency=low +python-epsilon (0.3.0+svn38480-maemo1) unstable; urgency=low * synched with svn repository. diff --git a/trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.diff b/trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.diff deleted file mode 100644 index 1858c93..0000000 --- a/trunk/python-epsilon/debian/patches/01-python-epsilon-thumb-canola.diff +++ /dev/null @@ -1,87 +0,0 @@ -From 71e5febf2f353efd9bff187c94d737760ba01b12 Mon Sep 17 00:00:00 2001 -From: Leonardo Sobral Cunha -Date: Sat, 24 Nov 2007 18:50:54 -0300 -Subject: [PATCH] Support for epsilon api for creating custom sized thumbs - ---- - epsilon/epsilon.c_epsilon.pyx | 11 +++++++++-- - epsilon/epsilon.request.pyx | 6 ++++-- - include/epsilon/c_epsilon.pxd | 1 + - 3 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/epsilon/epsilon.c_epsilon.pyx b/epsilon/epsilon.c_epsilon.pyx -index cfd58ca..8550884 100644 ---- a/epsilon/epsilon.c_epsilon.pyx -+++ b/epsilon/epsilon.c_epsilon.pyx -@@ -21,7 +21,7 @@ cdef class Epsilon: - """Epsilon constructor. - - @parm path: full path of image to process. -- @parm thumb_size: one of EPSILON_THUMB_NORMAL or EPSILON_THUMB_LARGE -+ @parm thumb_size: one of EPSILON_THUMB_NORMAL, EPSILON_THUMB_LARGE - @parm key: just used by edje to specify the part to process. - @parm resolution: just used by edje to specify render size. - """ -@@ -114,7 +114,7 @@ cdef class Epsilon: - EPSILON_THUMB_LARGE (256x256). - """ - if value != EPSILON_THUMB_NORMAL and value != EPSILON_THUMB_LARGE: -- raise ValueError("value must be either EPSILON_THUMB_NORMAL or " -+ raise ValueError("value must be either EPSILON_THUMB_NORMAL, " - "EPSILON_THUMB_LARGE") - epsilon_thumb_size(self.obj, value) - -@@ -133,6 +133,13 @@ cdef class Epsilon: - def __get__(self): - return self.thumb_size_get() - -+ def thumb_custom_size_set(self, int w, int h, char *dir): -+ """Specify a custom thumbnail size. -+ """ -+ if w <= 0 and h <= 0: -+ raise ValueError("either dimension value must be positive.") -+ epsilon_custom_thumb_size(self.obj, w, h, dir) -+ - def file_get(self): - "@rtype: str" - cdef char *s -diff --git a/epsilon/epsilon.request.pyx b/epsilon/epsilon.request.pyx -index c9a9fad..eea60da 100644 ---- a/epsilon/epsilon.request.pyx -+++ b/epsilon/epsilon.request.pyx -@@ -13,6 +13,7 @@ def init(): - - EPSILON_THUMB_NORMAL = 0 - EPSILON_THUMB_LARGE = 1 -+EPSILON_THUMB_CANOLA = 2 - - cdef class Request: - """Request epsilon_thumbd the thumbnail for the given image at given size. -@@ -37,9 +38,10 @@ cdef class Request: - if not callable(func): - raise TypeError("Parameter 'func' must be callable") - -- if size != EPSILON_THUMB_NORMAL and size != EPSILON_THUMB_LARGE: -+ if size != EPSILON_THUMB_NORMAL and size != EPSILON_THUMB_LARGE and \ -+ size != EPSILON_THUMB_CANOLA: - raise ValueError("Invalid size, must be EPSILON_THUMB_NORMAL or " -- "EPSILON_THUMB_LARGE") -+ "EPSILON_THUMB_LARGE or EPSILON_THUMB_CANOLA") - - if self.obj == NULL: - self.func = func -diff --git a/include/epsilon/c_epsilon.pxd b/include/epsilon/c_epsilon.pxd -index 6c4a44a..1838d7f 100644 ---- a/include/epsilon/c_epsilon.pxd -+++ b/include/epsilon/c_epsilon.pxd -@@ -40,6 +40,7 @@ cdef extern from "Epsilon.h": - int epsilon_exists(_Epsilon *e) - int epsilon_generate(_Epsilon *e) - void epsilon_thumb_size(_Epsilon *e, int size) -+ void epsilon_custom_thumb_size(_Epsilon *e, int w, int h, char *dir) - - _Epsilon_Info *epsilon_info_get (_Epsilon *e) - --- -1.5.4.3 - diff --git a/trunk/python-epsilon/debian/patches/series b/trunk/python-epsilon/debian/patches/series deleted file mode 100644 index e99ac2c..0000000 --- a/trunk/python-epsilon/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01-python-epsilon-thumb-canola.diff diff --git a/trunk/python-etk/debian/changelog b/trunk/python-etk/debian/changelog index 8eb3ac9..4701566 100644 --- a/trunk/python-etk/debian/changelog +++ b/trunk/python-etk/debian/changelog @@ -1,4 +1,4 @@ -python-etk (0.1.2+svn36098-maemo3) unstable; urgency=low +python-etk (0.1.2+svn38480-maemo1) unstable; urgency=low * Updated package version. diff --git a/trunk/python-evas/debian/changelog b/trunk/python-evas/debian/changelog index 488ebeb..b2352a8 100644 --- a/trunk/python-evas/debian/changelog +++ b/trunk/python-evas/debian/changelog @@ -1,4 +1,4 @@ -python-evas (0.3.0+svn36098-maemo1) unstable; urgency=low +python-evas (0.3.0+svn38480-maemo1) unstable; urgency=low * Synched with svn repository. diff --git a/trunk/scripts/build.sh b/trunk/scripts/build.sh index 0eac4bf..c75296f 100755 --- a/trunk/scripts/build.sh +++ b/trunk/scripts/build.sh @@ -1,7 +1,7 @@ #!/bin/sh components=$* -[ -z "$components" ] && components="eet evas ecore embryo edje python-evas python-ecore python-edje" +[ -z "$components" ] && components="eina eet evas ecore embryo edje python-evas python-ecore python-edje" export SBOX_DEFAULT_AUTOMAKE=1.8 diff --git a/trunk/scripts/mktarball-efl.sh b/trunk/scripts/mktarball-efl.sh index f365f2d..fb4e227 100755 --- a/trunk/scripts/mktarball-efl.sh +++ b/trunk/scripts/mktarball-efl.sh @@ -1,7 +1,7 @@ #!/bin/sh components=$* -[ -z "$components" ] && components='eet evas ecore embryo edje epeg imlib2 epsilon etk e_dbus' +[ -z "$components" ] && components='eina eet evas ecore embryo edje epeg imlib2 epsilon etk e_dbus' export SBOX_DEFAULT_AUTOMAKE=1.8 diff --git a/trunk/scripts/var-definitions.sh b/trunk/scripts/var-definitions.sh index 167e948..ae5de94 100644 --- a/trunk/scripts/var-definitions.sh +++ b/trunk/scripts/var-definitions.sh @@ -55,7 +55,7 @@ __e17_python_efl_utils="users/barbieri" # modules to build #__lib_modules="edb eet evas ecore embryo edje efreet epeg epsilon emotion etk ewl e_dbus exml enhance" -__lib_modules="eet:evas:ecore:embryo:edje:epsilon:etk:e_dbus" +__lib_modules="eina:eet:evas:ecore:embryo:edje:epsilon:etk:e_dbus" #__other_modules="himf-ecore:himf-ecore-chinook:lightmediascanner:python-lightmediascanner" __other_modules="" __python_modules="python-evas:python-ecore:python-edje:python-epsilon:python-e_dbus:python-etk" -- 1.7.9.5