[Pkg-e-commits] [SCM] Enlightenment 17 branch, master, updated. debian/0.16.999.050+svn20081207-1-7313-gf7e11d5
Albin Tonnerre
albin.tonnerre at gmail.com
Sat Feb 14 13:19:57 UTC 2009
The following commit has been merged in the master branch:
commit f7e11d5b26014332a6b3c766e0b9d21628adf6f6
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Tue Feb 3 15:58:57 2009 +0100
New SVN snapshot
diff --git a/debian/changelog b/debian/changelog
index e50220f..06ac68a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
-e17 (0.16.999.050+svn20081207-3) UNRELEASED; urgency=low
+e17 (0.16.999.050+svn20090203-1) experimental; urgency=low
[Albin Tonnerre]
- * debian/e17.install: Add missing illume dicts and keyboards
+ * New SVN snapshot
+ - Remove some patches, applied upstream:
+ + 01_install_internal-use_binaries_in_usr_lib_enlightenment.diff
+ + 03_fix_src-bin-makefile.diff
+ + 04_fix_e_fm_main_svn38418.diff
+ - control: tighten builddeps and depends of efl-dev
+ - e17.install: install binaries located in usr/lib/enlightenment/utils
+ * e17.install: Add missing illume dicts and keyboards (Closes: #513854)
[Luca Capello]
* debian/e17-data.install:
@@ -9,7 +16,7 @@ e17 (0.16.999.050+svn20081207-3) UNRELEASED; urgency=low
* debian/e17.lintian-overrides.in:
- Add override for 'image-file-in-usr-lib' for illume keyboard images
- -- Albin Tonnerre <albin.tonnerre at gmail.com> Sun, 01 Feb 2009 00:22:52 +0100
+ -- Albin Tonnerre <albin.tonnerre at gmail.com> Sat, 07 Feb 2009 10:29:53 +0100
e17 (0.16.999.050+svn20081207-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 5d4e5ca..1d78acb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Maintainer: Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
Uploaders: Albin Tonnerre <albin.tonnerre at gmail.com>,
Xavier Oswald <x.oswald at free.fr>, Jan Lübbe <jluebbe at debian.org>
Build-Depends: debhelper (>= 6.0.7), cdbs (>= 0.4.52), libeet-dev (>= 1.0.1),
- libedje-dev (>= 0.9.9.050+svn20081206), libefreet-dev (>= 0.5.0.050+svn20081114),
- libecore-dev (>= 0.9.9.050+svn20081201), libedbus-dev (>= 0.5.0.050+svn20081126),
- libevas-dev (>= 0.9.9.050+svn20081206), libeina-dev, libasound2-dev
- libxext-dev, libeet-bin, libedje-bin, libpam0g-dev
+ libedje-dev (>= 0.9.9.050+svn20081206), libefreet-dev (>= 0.5.0.050+svn20090203),
+ libecore-dev (>= 0.9.9.050+svn20090202), libedbus-dev (>= 0.5.0.050+svn20090130),
+ libevas-dev (>= 0.9.9.050+svn20090201), libeina-dev (>= 0.0.1~svn20090128),
+ libasound2-dev, libxext-dev, libeet-bin, libedje-bin, libpam0g-dev
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/pkg-e/apps/e.git
Vcs-Browser: http://git.debian.org/?p=pkg-e/apps/e.git
@@ -58,9 +58,9 @@ Package: efl-dev
Architecture: any
Section: devel
Depends: ${misc:Depends}, libeet-dev (>= 1.0.1),
- libedje-dev (>= 0.9.9.050+svn20081206), libefreet-dev (>= 0.5.0.050+svn20081114),
- libecore-dev (>= 0.9.9.050+svn20081201), libedbus-dev (>= 0.5.0.050+svn20081126),
- libevas-dev (>= 0.9.9.050+svn20081206), libeina-dev
+ libedje-dev (>= 0.9.9.050+svn20081206), libefreet-dev (>= 0.5.0.050+svn20090203),
+ libecore-dev (>= 0.9.9.050+svn20090202), libedbus-dev (>= 0.5.0.050+svn20090130),
+ libevas-dev (>= 0.9.9.050+svn20090201), libeina-dev (>= 0.0.1~svn20090128)
Description: EFL headers, static libraries and documentation
Enlightenment is an advanced window manager for X11. Unique
features include: a fully animated background, nice drop shadows
diff --git a/debian/e17.install b/debian/e17.install
index 8d803b8..352d463 100644
--- a/debian/e17.install
+++ b/debian/e17.install
@@ -3,11 +3,7 @@ debian/tmp/usr/bin/enlightenment_remote
debian/tmp/usr/bin/enlightenment_start
debian/tmp/usr/bin/enlightenment_imc
debian/tmp/usr/bin/enlightenment_fm_open
-debian/tmp/usr/bin/enlightenment_fm usr/lib/enlightenment
-debian/tmp/usr/bin/enlightenment_fm_op usr/lib/enlightenment
-debian/tmp/usr/bin/enlightenment_init usr/lib/enlightenment
-debian/tmp/usr/bin/enlightenment_sys usr/lib/enlightenment
-debian/tmp/usr/bin/enlightenment_thumb usr/lib/enlightenment
+debian/tmp/usr/lib/enlightenment/utils/enlightenment_*
debian/tmp/etc/enlightenment/sysactions.conf
debian/tmp/usr/lib/enlightenment/preload/e_precache.so
debian/tmp/usr/lib/enlightenment/modules/*/*/module.so
diff --git a/debian/e17.lintian-overrides.in b/debian/e17.lintian-overrides.in
index 82cda83..ad97189 100644
--- a/debian/e17.lintian-overrides.in
+++ b/debian/e17.lintian-overrides.in
@@ -1,6 +1,6 @@
e17: possible-gpl-code-linked-with-openssl
e17: setuid-binary usr/lib/enlightenment/modules/cpufreq/ARCH_PATH/freqset 4755 root/root
-e17: setuid-binary usr/lib/enlightenment/enlightenment_sys 4755 root/root
+e17: setuid-binary usr/lib/enlightenment/utils/enlightenment_sys 4755 root/root
e17: image-file-in-usr-lib usr/lib/enlightenment/modules/illume/keyboards/alpha.png
e17: image-file-in-usr-lib usr/lib/enlightenment/modules/illume/keyboards/backspace.png
e17: image-file-in-usr-lib usr/lib/enlightenment/modules/illume/keyboards/down.png
diff --git a/debian/patches/01_install_internal-use_binaries_in_usr_lib_enlightenment.diff b/debian/patches/01_install_internal-use_binaries_in_usr_lib_enlightenment.diff
deleted file mode 100644
index 9dc5371..0000000
--- a/debian/patches/01_install_internal-use_binaries_in_usr_lib_enlightenment.diff
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
-index 4d3a615..cf39f67 100644
---- a/src/bin/e_fm.c
-+++ b/src/bin/e_fm.c
-@@ -1512,7 +1512,7 @@ _e_fm2_client_spawn(void)
- char buf[4096];
-
- if (_e_fm2_client_spawning) return;
-- snprintf(buf, sizeof(buf), "%s/enlightenment_fm", e_prefix_bin_get());
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_fm", e_prefix_lib_get());
- exe = ecore_exe_run(buf, NULL);
- _e_fm2_client_spawning = 1;
- }
-diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c
-index 2343213..4d19435 100644
---- a/src/bin/e_fm_main.c
-+++ b/src/bin/e_fm_main.c
-@@ -2175,7 +2175,7 @@ _e_prepare_command(E_Fm_Op_Type type, const char *args)
-
- length = 256 + strlen(e_prefix_bin_get()) + strlen(args);
- buffer = malloc(length);
-- length = snprintf(buffer, length, "%s/enlightenment_fm_op %s %s", e_prefix_bin_get(), command, args);
-+ length = snprintf(buffer, length, "%s/enlightenment/enlightenment_fm_op %s %s", e_prefix_lib_get(), command, args);
-
- return buffer;
- }
-diff --git a/src/bin/e_init.c b/src/bin/e_init.c
-index 3afde55..8da9512 100644
---- a/src/bin/e_init.c
-+++ b/src/bin/e_init.c
-@@ -77,8 +77,8 @@ e_init_show(void)
- if (version) ver = strdup(e_util_filename_escape(version));
- else ver = strdup("XvX");
-
-- snprintf(buf, sizeof(buf), "%s/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'",
-- e_prefix_bin_get(),
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'",
-+ e_prefix_lib_get(),
- theme,
- e_canvas_engine_decide(e_config->evas_engine_init),
- e_config->font_hinting,
-diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
-index 945fb90..4e7bfb2 100644
---- a/src/bin/e_sys.c
-+++ b/src/bin/e_sys.c
-@@ -168,13 +168,13 @@ _e_sys_cb_timer(void *data)
- char buf[4096];
-
- e_init_status_set(_("Checking System Permissions"));
-- snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t halt", e_prefix_bin_get());
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys -t halt", e_prefix_lib_get());
- _e_sys_halt_check_exe = ecore_exe_run(buf, NULL);
-- snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t reboot", e_prefix_bin_get());
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys -t reboot", e_prefix_lib_get());
- _e_sys_reboot_check_exe = ecore_exe_run(buf, NULL);
-- snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t suspend", e_prefix_bin_get());
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys -t suspend", e_prefix_lib_get());
- _e_sys_suspend_check_exe = ecore_exe_run(buf, NULL);
-- snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t hibernate", e_prefix_bin_get());
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys -t hibernate", e_prefix_lib_get());
- _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
- return 0;
- }
-@@ -515,8 +515,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
- case E_SYS_HALT_NOW:
- /* shutdown -h now */
- if (e_util_immortal_check()) return 0;
-- snprintf(buf, sizeof(buf), "%s/enlightenment_sys halt",
-- e_prefix_bin_get());
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys halt",
-+ e_prefix_lib_get());
- if (_e_sys_exe)
- {
- _e_sys_current_action();
-@@ -542,8 +542,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
- case E_SYS_REBOOT:
- /* shutdown -r now */
- if (e_util_immortal_check()) return 0;
-- snprintf(buf, sizeof(buf), "%s/enlightenment_sys reboot",
-- e_prefix_bin_get());
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys reboot",
-+ e_prefix_lib_get());
- if (_e_sys_exe)
- {
- _e_sys_current_action();
-@@ -568,8 +568,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
- break;
- case E_SYS_SUSPEND:
- /* /etc/acpi/sleep.sh force */
-- snprintf(buf, sizeof(buf), "%s/enlightenment_sys suspend",
-- e_prefix_bin_get());
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys suspend",
-+ e_prefix_lib_get());
- if (_e_sys_exe)
- {
- _e_sys_current_action();
-@@ -594,8 +594,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
- break;
- case E_SYS_HIBERNATE:
- /* /etc/acpi/hibernate.sh force */
-- snprintf(buf, sizeof(buf), "%s/enlightenment_sys hibernate",
-- e_prefix_bin_get());
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_sys hibernate",
-+ e_prefix_lib_get());
- if (_e_sys_exe)
- {
- _e_sys_current_action();
-diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c
-index 88d45ea..75bfa3f 100644
---- a/src/bin/e_thumb.c
-+++ b/src/bin/e_thumb.c
-@@ -134,7 +134,7 @@ e_thumb_icon_begin(Evas_Object *obj)
- {
- Ecore_Exe *exe;
-
-- snprintf(buf, sizeof(buf), "%s/enlightenment_thumb --nice=%d", e_prefix_bin_get(),
-+ snprintf(buf, sizeof(buf), "%s/enlightenment/enlightenment_thumb --nice=%d", e_prefix_lib_get(),
- e_config->thumb_nice);
- exe = ecore_exe_run(buf, NULL);
- _thumbnailers_exe = eina_list_append(_thumbnailers_exe, exe);
diff --git a/debian/patches/03_fix_src-bin-makefile.diff b/debian/patches/03_fix_src-bin-makefile.diff
deleted file mode 100644
index d114ba5..0000000
--- a/debian/patches/03_fix_src-bin-makefile.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
-index faef192..8d4b2ba 100644
---- a/src/bin/Makefile.am
-+++ b/src/bin/Makefile.am
-@@ -340,8 +340,7 @@ enlightenment_thumb_LDFLAGS = @e_libs@
- enlightenment_fm_SOURCES = \
- e_fm_main.c \
- e_user.c \
--e_sha1.c \
--e_prefix.c
-+e_sha1.c
-
- enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@
- enlightenment_fm_CFLAGS = $(INCLUDES)
-diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
-index 6ac3d48..9775187 100644
---- a/src/bin/Makefile.in
-+++ b/src/bin/Makefile.in
-@@ -120,8 +120,7 @@ enlightenment_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(enlightenment_LDFLAGS) $(LDFLAGS) -o $@
- am_enlightenment_fm_OBJECTS = enlightenment_fm-e_fm_main.$(OBJEXT) \
- enlightenment_fm-e_user.$(OBJEXT) \
-- enlightenment_fm-e_sha1.$(OBJEXT) \
-- enlightenment_fm-e_prefix.$(OBJEXT)
-+ enlightenment_fm-e_sha1.$(OBJEXT)
- enlightenment_fm_OBJECTS = $(am_enlightenment_fm_OBJECTS)
- enlightenment_fm_LDADD = $(LDADD)
- enlightenment_fm_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -709,8 +708,7 @@ enlightenment_thumb_LDFLAGS = @e_libs@
- enlightenment_fm_SOURCES = \
- e_fm_main.c \
- e_user.c \
--e_sha1.c \
--e_prefix.c
-+e_sha1.c
-
- enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@
- enlightenment_fm_CFLAGS = $(INCLUDES)
-@@ -976,7 +974,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_xinerama.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_zone.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm-e_fm_main.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm-e_prefix.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm-e_sha1.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm-e_user.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enlightenment_fm_op-e_fm_op.Po at am__quote@
-@@ -1046,20 +1043,6 @@ enlightenment_fm-e_sha1.obj: e_sha1.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -c -o enlightenment_fm-e_sha1.obj `if test -f 'e_sha1.c'; then $(CYGPATH_W) 'e_sha1.c'; else $(CYGPATH_W) '$(srcdir)/e_sha1.c'; fi`
-
--enlightenment_fm-e_prefix.o: e_prefix.c
-- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -MT enlightenment_fm-e_prefix.o -MD -MP -MF $(DEPDIR)/enlightenment_fm-e_prefix.Tpo -c -o enlightenment_fm-e_prefix.o `test -f 'e_prefix.c' || echo '$(srcdir)/'`e_prefix.c
-- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/enlightenment_fm-e_prefix.Tpo $(DEPDIR)/enlightenment_fm-e_prefix.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e_prefix.c' object='enlightenment_fm-e_prefix.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -c -o enlightenment_fm-e_prefix.o `test -f 'e_prefix.c' || echo '$(srcdir)/'`e_prefix.c
--
--enlightenment_fm-e_prefix.obj: e_prefix.c
-- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -MT enlightenment_fm-e_prefix.obj -MD -MP -MF $(DEPDIR)/enlightenment_fm-e_prefix.Tpo -c -o enlightenment_fm-e_prefix.obj `if test -f 'e_prefix.c'; then $(CYGPATH_W) 'e_prefix.c'; else $(CYGPATH_W) '$(srcdir)/e_prefix.c'; fi`
-- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/enlightenment_fm-e_prefix.Tpo $(DEPDIR)/enlightenment_fm-e_prefix.Po
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='e_prefix.c' object='enlightenment_fm-e_prefix.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_CFLAGS) $(CFLAGS) -c -o enlightenment_fm-e_prefix.obj `if test -f 'e_prefix.c'; then $(CYGPATH_W) 'e_prefix.c'; else $(CYGPATH_W) '$(srcdir)/e_prefix.c'; fi`
--
- enlightenment_fm_op-e_fm_op.o: e_fm_op.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(enlightenment_fm_op_CFLAGS) $(CFLAGS) -MT enlightenment_fm_op-e_fm_op.o -MD -MP -MF $(DEPDIR)/enlightenment_fm_op-e_fm_op.Tpo -c -o enlightenment_fm_op-e_fm_op.o `test -f 'e_fm_op.c' || echo '$(srcdir)/'`e_fm_op.c
- @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/enlightenment_fm_op-e_fm_op.Tpo $(DEPDIR)/enlightenment_fm_op-e_fm_op.Po
diff --git a/debian/patches/04_fix_e_fm_main_svn38418.diff b/debian/patches/04_fix_e_fm_main_svn38418.diff
deleted file mode 100644
index f31390e..0000000
--- a/debian/patches/04_fix_e_fm_main_svn38418.diff
+++ /dev/null
@@ -1,170 +0,0 @@
-diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c
-index a5facaa..cbc6f5c 100644
---- a/src/bin/e_fm_main.c
-+++ b/src/bin/e_fm_main.c
-@@ -40,10 +40,8 @@
-
- #define E_TYPEDEFS
- #include "e_fm_op.h"
--#include "e_prefix.h"
- #undef E_TYPEDEFS
- #include "e_fm_op.h"
--#include "e_prefix.h"
-
- /* FIXME: things to add to the slave enlightenment_fm process and ipc to e:
- *
-@@ -252,17 +250,6 @@ main(int argc, char **argv)
- ecore_file_init();
- ecore_ipc_init();
-
-- if (!e_prefix_determine(argv[0]))
-- {
-- fprintf(stderr,
-- "ERROR: Enlightenment cannot determine its installed\n"
-- " prefix from the system or argv[0].\n"
-- " This is because it is not on Linux AND has been\n"
-- " Executed strangely. This is unusual.\n"
-- );
-- e_prefix_fallback();
-- }
--
- ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _e_fm_slave_data_cb, NULL);
- ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _e_fm_slave_error_cb, NULL);
- ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_fm_slave_del_cb, NULL);
-@@ -304,8 +291,6 @@ main(int argc, char **argv)
- e_dbus_shutdown();
- _e_storage_volume_edd_shutdown();
-
-- e_prefix_shutdown();
--
- ecore_ipc_shutdown();
- ecore_file_shutdown();
- eina_stringshare_shutdown();
-@@ -2173,9 +2158,11 @@ _e_prepare_command(E_Fm_Op_Type type, const char *args)
- else
- strcpy(command, "cp");
-
-- length = 256 + strlen(e_prefix_bin_get()) + strlen(args);
-+ length = 256 + strlen(getenv("E_LIB_DIR")) + strlen(args);
- buffer = malloc(length);
-- length = snprintf(buffer, length, "%s/enlightenment/enlightenment_fm_op %s %s", e_prefix_lib_get(), command, args);
-+ length = snprintf(buffer, length,
-+ "%s/enlightenment/enlightenment_fm_op %s %s",
-+ getenv("E_LIB_DIR"), command, args);
-
- return buffer;
- }
-diff --git a/src/bin/e_prefix.c b/src/bin/e_prefix.c
-index dac1b13..f007a6e 100644
---- a/src/bin/e_prefix.c
-+++ b/src/bin/e_prefix.c
-@@ -29,6 +29,7 @@ e_prefix_determine(char *argv0)
- {
- char *p, buf[4096];
-
-+ printf("e_prefix_determine()\n");
- e_prefix_shutdown();
-
- /* if user provides E_PREFIX - then use that or also more specific sub
-@@ -37,28 +38,40 @@ e_prefix_determine(char *argv0)
- {
- _prefix_path = strdup(getenv("E_PREFIX"));
- if (getenv("E_BIN_DIR"))
-- snprintf(buf, sizeof(buf), "%s/bin", getenv("E_BIN_DIR"));
-+ _prefix_path_bin = strdup(getenv("E_BIN_DIR"));
- else
-- snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
-- _prefix_path_bin = strdup(buf);
-+ {
-+ snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
-+ _prefix_path_bin = strdup(buf);
-+ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-+ }
-
- if (getenv("E_LIB_DIR"))
-- snprintf(buf, sizeof(buf), "%s/lib", getenv("E_LIB_DIR"));
-+ _prefix_path_lib = strdup(getenv("E_LIB_DIR"));
- else
-- snprintf(buf, sizeof(buf), "%s/lib", _prefix_path);
-- _prefix_path_lib = strdup(buf);
-+ {
-+ snprintf(buf, sizeof(buf), "%s/lib", _prefix_path);
-+ _prefix_path_lib = strdup(buf);
-+ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-+ }
-
- if (getenv("E_DATA_DIR"))
-- snprintf(buf, sizeof(buf), "%s/"SHARE_D, getenv("E_DATA_DIR"));
-+ _prefix_path_data = strdup(getenv("E_DATA_DIR"));
- else
-- snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path);
-- _prefix_path_data = strdup(buf);
-+ {
-+ snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path);
-+ _prefix_path_data = strdup(buf);
-+ e_util_env_set("E_DATA_DIR", _prefix_path_data);
-+ }
-
- if (getenv("E_LOCALE_DIR"))
-- snprintf(buf, sizeof(buf), "%s/"LOCALE_D, getenv("E_LOCALE_DIR"));
-+ _prefix_path_locale = strdup(getenv("E_LOCALE_DIR"));
- else
-- snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path);
-- _prefix_path_locale = strdup(buf);
-+ {
-+ snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path);
-+ _prefix_path_locale = strdup(buf);
-+ e_util_env_set("E_LOCALE_DIR", _prefix_path_locale);
-+ }
- return 1;
- }
- /* no env var - examine process and possible argv0 */
-@@ -67,6 +80,10 @@ e_prefix_determine(char *argv0)
- if (!_e_prefix_try_argv(argv0))
- {
- e_prefix_fallback();
-+ e_util_env_set("E_PREFIX", _prefix_path);
-+ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-+ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-+ e_util_env_set("E_DATA_DIR", _prefix_path_data);
- return 0;
- }
- }
-@@ -121,14 +138,26 @@ e_prefix_determine(char *argv0)
- else
- {
- e_prefix_fallback();
-+ e_util_env_set("E_PREFIX", _prefix_path);
-+ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-+ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-+ e_util_env_set("E_DATA_DIR", _prefix_path_data);
- return 0;
- }
- }
-+ e_util_env_set("E_PREFIX", _prefix_path);
-+ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-+ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-+ e_util_env_set("E_DATA_DIR", _prefix_path_data);
- return 1;
- }
- else
- {
- e_prefix_fallback();
-+ e_util_env_set("E_PREFIX", _prefix_path);
-+ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-+ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-+ e_util_env_set("E_DATA_DIR", _prefix_path_data);
- return 0;
- }
- }
-@@ -136,6 +165,10 @@ e_prefix_determine(char *argv0)
- }
- }
- e_prefix_fallback();
-+ e_util_env_set("E_PREFIX", _prefix_path);
-+ e_util_env_set("E_BIN_DIR", _prefix_path_bin);
-+ e_util_env_set("E_LIB_DIR", _prefix_path_lib);
-+ e_util_env_set("E_DATA_DIR", _prefix_path_data);
- return 0;
- }
-
diff --git a/debian/rules b/debian/rules
index b885b44..871ab2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ install/e17::
sed "s/ARCH_PATH/$(ARCH_PATH)/" debian/e17.lintian-overrides.in > debian/e17.lintian-overrides
binary-predeb/e17::
- chmod 4755 debian/e17/usr/lib/enlightenment/enlightenment_sys
+ chmod 4755 debian/e17/usr/lib/enlightenment/utils/enlightenment_sys
chmod 4755 debian/e17/usr/lib/enlightenment/modules/cpufreq/*/freqset
clean/e17::
--
Enlightenment 17
More information about the Pkg-e-commits
mailing list