[Pkg-e-commits] [SCM] Enlightenment 17 branch, master, updated. debian/0.16.999.050-1-3-g6fa166f
Albin Tonnerre
albin.tonnerre at gmail.com
Sat Dec 27 13:42:22 UTC 2008
The following commit has been merged in the master branch:
commit 6fa166f182a9485022e05224727a8c623316d4b9
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Sun Dec 7 16:16:41 2008 +0100
new upstream snapshot. several packaging updates and changes, see debian/changelog for further information
diff --git a/debian/changelog b/debian/changelog
index f7da617..a2b4c27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+e17 (0.16.999.050+svn20081207-1) experimental; urgency=low
+
+ * Upstream SVN snapshot
+ - build-depend and make efl-dev depend on libeina-0.0.1a-dev
+ * Update {build,}dependencies to match the new EFL packages name
+ * Ship enlightenment.pc instead of enlightenment-config, as the latter is
+ now deprecated (Closes: #504293)
+ * Build-Depend on libasound2-dev to get the mixer module working
+ - Closes: #506847
+ * Make e17 depend on libedje-bin as this is necessary for e.g. changing the
+ background.
+ * No longer remove the wizard module from the package, as it is now usable
+ * Add debian/patches/02_fix_default_config_for_upgrades.diff:
+ - Add buttons for halt/shutdown/etc to the syscon module for the default
+ profile. Without that, users upgrading from older versions would have an
+ empty 'system' menu
+ * debian/patches/01_install_internal-use_binaries_in_usr_lib_enlightenment.diff:
+ - update, as a new binary going in /usr/lib/enlightenment was introduced
+ * lintian fixes:
+ - add ${misc:Depends} to dependencies
+ - remove e17-data.lintian-overrides, no longer needed
+ - Add overrides about setuid root programs to e17.lintian-overrides
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com> Sat, 27 Dec 2008 14:30:42 +0100
+
e17 (0.16.999.050-1) experimental; urgency=low
* New upstream version (Closes: #504057)
diff --git a/debian/control b/debian/control
index e45cebd..ffd0ae5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ 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), libedje-bin, libpam0g-dev, libefreet-dev,
- libecore-dev (>= 0.9.9.050), libedbus-dev, libxext-dev, libeet-bin,
- libevas-dev (>= 0.9.9.050)
+ libedje-0.9.9.050a-dev, libedje-bin, libpam0g-dev, libefreet-dev (>= 0.5.0.050+svn20081114),
+ libecore-0.9.9.050a-dev, libedbus-0.5.0.050a-dev, libxext-dev, libeet-bin,
+ libevas-0.9.9.050a-dev, libeina-0.0.1a-dev, libasound2-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
@@ -15,7 +15,7 @@ Homepage: http://www.enlightenment.org
Package: e17
Architecture: any
-Depends: ${shlibs:Depends}, e17-data (= ${source:Version}), libevas-engines
+Depends: ${misc:Depends}, ${shlibs:Depends}, e17-data (= ${source:Version}), libevas-0.9.9.050a-engines, libedje-bin
Conflicts: enlightenment
Provides: x-window-manager
Description: The Enlightenment DR17 Window Manager
@@ -28,6 +28,7 @@ Description: The Enlightenment DR17 Window Manager
Package: e17-data
Architecture: all
+Depends: ${misc:Depends}
Enhances: e17
Conflicts: enlightenment-data
Description: Enlightenment Window Manager Run Time Data Files
@@ -42,7 +43,7 @@ Description: Enlightenment Window Manager Run Time Data Files
Package: e17-dev
Architecture: any
Section: devel
-Depends: e17 (= ${binary:Version}), efl-dev
+Depends: ${misc:Depends}, e17 (= ${binary:Version}), efl-dev
Description: Enlightenment headers, static libraries and documentation
Enlightenment is an advanced window manager for X11. Unique
features include: a fully animated background, nice drop shadows
@@ -55,7 +56,9 @@ Description: Enlightenment headers, static libraries and documentation
Package: efl-dev
Architecture: any
Section: devel
-Depends: libeet-dev, libevas-dev, libecore-dev, libedje-dev, libefreet-dev, libedbus-dev
+Depends: ${misc:Depends}, libeet-dev (>= 1.0.1), libevas-0.9.9.050a-dev, libecore-0.9.9.050a-dev,
+ libedje-0.9.9.050a-dev, libefreet-dev (>= 0.5.0.050+svn20081114), libeina-0.0.1a-dev,
+ libedbus-0.5.0.050a-dev
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
@@ -68,7 +71,7 @@ Description: EFL headers, static libraries and documentation
Package: e17-dbg
Architecture: any
Section: devel
-Depends: e17 (= ${binary:Version})
+Depends: ${misc:Depends}, e17 (= ${binary:Version})
Priority: extra
Description: The Enlightenment DR17 Window Manager
Enlightenment is an advanced window manager for X11. Unique
diff --git a/debian/e17-data.lintian-overrides b/debian/e17-data.lintian-overrides
deleted file mode 100644
index 25b9347..0000000
--- a/debian/e17-data.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-e17-data: package-contains-empty-directory usr/share/enlightenment/data/fonts/
diff --git a/debian/e17-dev.install b/debian/e17-dev.install
index b591f85..5e48d91 100644
--- a/debian/e17-dev.install
+++ b/debian/e17-dev.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/bin/enlightenment-config
+debian/tmp/usr/lib/pkgconfig/enlightenment.pc
debian/tmp/usr/include/enlightenment/*.h
diff --git a/debian/e17.install b/debian/e17.install
index ceedd3e..566778e 100644
--- a/debian/e17.install
+++ b/debian/e17.install
@@ -2,7 +2,9 @@ debian/tmp/usr/bin/enlightenment
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
@@ -14,3 +16,4 @@ debian/tmp/usr/lib/enlightenment/modules/*/e-module-*.edj
debian/tmp/usr/lib/enlightenment/modules/battery/*/batget
debian/tmp/usr/lib/enlightenment/modules/cpufreq/*/freqset
debian/tmp/usr/lib/enlightenment/modules/temperature/*/tempget
+debian/tmp/usr/lib/enlightenment/modules/wizard/*/page*.so
diff --git a/debian/e17.lintian-overrides b/debian/e17.lintian-overrides
index b927362..4c77fde 100644
--- a/debian/e17.lintian-overrides
+++ b/debian/e17.lintian-overrides
@@ -1 +1,3 @@
e17: possible-gpl-code-linked-with-openssl
+e17: setuid-binary usr/lib/enlightenment/modules/cpufreq/linux-gnu-x86_64/freqset 4755 root/root
+e17: setuid-binary usr/lib/enlightenment/enlightenment_sys 4755 root/root
diff --git a/debian/enlightenment-config.1 b/debian/enlightenment-config.1
deleted file mode 100644
index e55354a..0000000
--- a/debian/enlightenment-config.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH ENLIGHTENMENT-CONFIG 1 "May 1, 2008" enlightenment
-.SH NAME
-enlighenment-config \- get and set informations about installed enlightenment
-.SH SYNOPSIS
-.B enlightenment-config
-[\fIOPTION\fR] ...
-.br
-.SH DESCRIPTION
-Provides information about the installed enlightenment (e17) program
-.SH OPTION
-Values for OPTION are:
-.TP
-\fB\-\-prefix[=DIR]\fR
-print prefix. If DIR is given, set the prefix to DIR
-.TP
-\fB\-\-exec-prefix[=DIR]\fR
-print path to directory containing executables. If DIR is given, set the prefix to DIR
-.TP
-\fB\-\-libs\fR
-print library linking information
-.TP
-\fB\-\-cflags\fR
-print preprocessor flags and compiler options
-.TP
-\fB\-\-modules-dir\fR
-print installation patch of the modules
-.TP
-\fB\-\-help\fR
-print this help and exit
-.TP
-\fB\-\-version\fR
-print version information
-.SH BUGS
-To report a bug, please visit \fIhttp://bugs.enlightenment.org/\fR
-.SH AUTHOR
-.TP
-enlightenment was written by the Enlightenment Development Team
-.I http://web.enlightenment.org
-.PP
-This manual page was written by Albin Tonnerre <albin.tonnerre at gmail.com>
-for the Debian project (but may be used by others).
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
index 2aa3804..befc2a6 100644
--- 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
@@ -1,7 +1,8 @@
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
-@@ -1449,7 +1449,7 @@ _e_fm2_client_spawn(void)
+@@ -1512,7 +1512,7 @@ _e_fm2_client_spawn(void)
char buf[4096];
if (_e_fm2_client_spawning) return;
@@ -10,10 +11,24 @@ diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
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_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
-@@ -79,8 +79,8 @@
+@@ -77,8 +77,8 @@ e_init_show(void)
if (version) ver = strdup(e_util_filename_escape(version));
else ver = strdup("XvX");
@@ -25,9 +40,10 @@ diff --git a/src/bin/e_init.c b/src/bin/e_init.c
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
-@@ -126,13 +126,13 @@ _e_sys_cb_timer(void *data)
+@@ -168,13 +168,13 @@ _e_sys_cb_timer(void *data)
char buf[4096];
e_init_status_set(_("Checking System Permissions"));
@@ -45,8 +61,8 @@ diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
_e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
return 0;
}
-@@ -469,8 +469,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
- case E_SYS_HALT:
+@@ -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",
@@ -56,7 +72,7 @@ diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
if (_e_sys_exe)
{
_e_sys_current_action();
-@@ -496,8 +496,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
+@@ -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;
@@ -67,7 +83,7 @@ diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
if (_e_sys_exe)
{
_e_sys_current_action();
-@@ -522,8 +522,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
+@@ -568,8 +568,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
break;
case E_SYS_SUSPEND:
/* /etc/acpi/sleep.sh force */
@@ -78,7 +94,7 @@ diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
if (_e_sys_exe)
{
_e_sys_current_action();
-@@ -548,8 +548,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
+@@ -594,8 +594,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
break;
case E_SYS_HIBERNATE:
/* /etc/acpi/hibernate.sh force */
@@ -90,6 +106,7 @@ diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
{
_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)
@@ -100,4 +117,4 @@ diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c
+ 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 = evas_list_append(_thumbnailers_exe, exe);
+ _thumbnailers_exe = eina_list_append(_thumbnailers_exe, exe);
diff --git a/debian/patches/02_fix_default_config_for_upgrades.diff b/debian/patches/02_fix_default_config_for_upgrades.diff
new file mode 100644
index 0000000..c548517
--- /dev/null
+++ b/debian/patches/02_fix_default_config_for_upgrades.diff
@@ -0,0 +1,62 @@
+diff --git a/config/default/e.src b/config/default/e.src
+index 68fe2b8..4de2e16 100644
+--- a/config/default/e.src
++++ b/config/default/e.src
+@@ -527,4 +527,57 @@ group "E_Config" struct {
+ value "syscon.extra.icon_size" int: 48;
+ value "syscon.timeout" double: 0.0;
+ value "syscon.do_input" uchar: 0;
++ group "syscon.actions" list {
++ group "E_Config_Syscon_Action" struct {
++ value "action" string: "halt";
++ value "params" string: "now";
++ value "button" string: "button";
++ value "icon" string: "enlightenment/halt";
++ value "is_main" int: 1;
++ }
++ }
++ group "syscon.actions" list {
++ group "E_Config_Syscon_Action" struct {
++ value "action" string: "suspend";
++ value "params" string: "now";
++ value "button" string: "button";
++ value "icon" string: "enlightenment/suspend";
++ value "is_main" int: 1;
++ }
++ }
++ group "syscon.actions" list {
++ group "E_Config_Syscon_Action" struct {
++ value "action" string: "desk_lock";
++ value "button" string: "button";
++ value "icon" string: "enlightenment/desklock_menu";
++ value "is_main" int: 1;
++ }
++ }
++ group "syscon.actions" list {
++ group "E_Config_Syscon_Action" struct {
++ value "action" string: "reboot";
++ value "params" string: "now";
++ value "button" string: "button";
++ value "icon" string: "enlightenment/reboot";
++ value "is_main" int: 0;
++ }
++ }
++ group "syscon.actions" list {
++ group "E_Config_Syscon_Action" struct {
++ value "action" string: "hibernate";
++ value "params" string: "now";
++ value "button" string: "button";
++ value "icon" string: "enlightenment/hibernate";
++ value "is_main" int: 0;
++ }
++ }
++ group "syscon.actions" list {
++ group "E_Config_Syscon_Action" struct {
++ value "action" string: "logout";
++ value "params" string: "now";
++ value "button" string: "button";
++ value "icon" string: "enlightenment/logout";
++ value "is_main" int: 0;
++ }
++ }
+ }
diff --git a/debian/rules b/debian/rules
index 346b5f6..46c6f55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,16 +7,11 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
install/e17-data::
gzip -9 debian/tmp/usr/share/enlightenment/doc/*.txt
rm debian/tmp/usr/share/enlightenment/COPYING
- rm debian/tmp/usr/share/enlightenment/data/fonts/*
-
-install/e17::
- rm -r debian/tmp/usr/lib/enlightenment/modules/wizard
binary-predeb/e17::
chmod 4755 debian/e17/usr/lib/enlightenment/enlightenment_sys
chmod 4755 debian/e17/usr/lib/enlightenment/modules/cpufreq/*/freqset
DEB_INSTALL_MANPAGES_e17 := $(DEB_SRCDIR)/debian/enlightenment.1 $(DEB_SRCDIR)/debian/enlightenment_*.1
-DEB_INSTALL_MANPAGES_e17-dev := $(DEB_SRCDIR)/debian/enlightenment-config.1
DEB_DH_STRIP_ARGS := --dbg-package=e17-dbg
DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
--
Enlightenment 17
More information about the Pkg-e-commits
mailing list