[Pkg-e-commits] [SCM] Enlightenment 17 branch, master, updated. a346d8b7abf85977253f35a306a0dde693d3340f
Albin Tonnerre
albin.tonnerre at gmail.com
Thu May 1 11:54:08 UTC 2008
The following commit has been merged in the master branch:
commit 29fac0c315d7b9de36594fb3140e2d379035b3a7
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Wed Apr 30 21:30:45 2008 +0200
Cleanup: Add lintian overrides, update the doc-base section, install internal-use binaries in /usr/lib/enlightenment
diff --git a/debian/changelog b/debian/changelog
index b1abc8a..ea68624 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-e17 (0.16.999.042+dfsg-1) experimental; urgency=low
+e17 (0.16.999.042-1) experimental; urgency=low
* Initial Release (Closes: #405860)
diff --git a/debian/enlightenment-data.doc-base b/debian/enlightenment-data.doc-base
index 968bf41..1d8c2f3 100644
--- a/debian/enlightenment-data.doc-base
+++ b/debian/enlightenment-data.doc-base
@@ -1,9 +1,8 @@
Document: enlightenment
Title: Enlightenment DR17 Documentation
Author: Carsten Haitzler
-Abstract: This document describes what is Enlightenment DR17
- and how it works
-Section: Apps/Graphics
+Abstract: This document describes what is Enlightenment DR17 and how it works
+Section: Window Managers
Format: text
Files: /usr/share/doc/enlightenment/*.txt.gz
diff --git a/debian/enlightenment-data.install b/debian/enlightenment-data.install
index 9b6c12f..0a45eb4 100644
--- a/debian/enlightenment-data.install
+++ b/debian/enlightenment-data.install
@@ -1,3 +1,4 @@
+debian/tmp/usr/share/lintian/overrides/enlightenment-data
debian/tmp/usr/share/enlightenment
debian/tmp/usr/share/locale
debian/tmp/usr/share/xsessions
diff --git a/debian/enlightenment-data.overrides b/debian/enlightenment-data.overrides
new file mode 100644
index 0000000..ddb7245
--- /dev/null
+++ b/debian/enlightenment-data.overrides
@@ -0,0 +1 @@
+enlightenment-data: package-contains-empty-directory usr/share/enlightenment/data/fonts/
diff --git a/debian/enlightenment.install b/debian/enlightenment.install
index 22c2ccf..6507142 100644
--- a/debian/enlightenment.install
+++ b/debian/enlightenment.install
@@ -1,10 +1,17 @@
debian/tmp/usr/bin/enlightenment
-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 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/etc/enlightenment/sysactions.conf
debian/tmp/usr/lib/enlightenment/preload/e_precache.so
debian/tmp/usr/lib/enlightenment/modules/*/*/module.so
debian/tmp/usr/lib/enlightenment/modules/*/module.desktop
debian/tmp/usr/lib/enlightenment/modules/*/e-module-*.edj
-debian/tmp/usr/lib/enlightenment/modules/battery/*/batget
+#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/share/lintian/overrides/enlightenment
diff --git a/debian/enlightenment.overrides b/debian/enlightenment.overrides
new file mode 100644
index 0000000..dfaf846
--- /dev/null
+++ b/debian/enlightenment.overrides
@@ -0,0 +1 @@
+enlightenment: possible-gpl-code-linked-with-openssl
diff --git a/debian/enlightenment.postinst b/debian/enlightenment.postinst
index d7282b2..3edf720 100644
--- a/debian/enlightenment.postinst
+++ b/debian/enlightenment.postinst
@@ -7,8 +7,8 @@ wm=enlightenment_start
update-alternatives --install /usr/bin/x-window-manager x-window-manager \
/usr/bin/$wm 90
-chmod u+s /usr/bin/enlightenment_sys
-chmod u+s /usr/lib/enlightenment/modules/battery/*/batget
+chmod u+s /usr/lib/enlightenment/enlightenment_sys
+#chmod u+s /usr/lib/enlightenment/modules/battery/*/batget
chmod u+s /usr/lib/enlightenment/modules/cpufreq/*/freqset
chmod u+s /usr/lib/enlightenment/modules/temperature/*/tempget
#DEBHELPER#
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
new file mode 100644
index 0000000..3e7c454
--- /dev/null
+++ b/debian/patches/01_install_internal-use_binaries_in_usr_lib_enlightenment.diff
@@ -0,0 +1,103 @@
+diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
+--- a/src/bin/e_fm.c
++++ b/src/bin/e_fm.c
+@@ -1449,7 +1449,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_init.c b/src/bin/e_init.c
+--- a/src/bin/e_init.c
++++ b/src/bin/e_init.c
+@@ -79,8 +79,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
+--- a/src/bin/e_sys.c
++++ b/src/bin/e_sys.c
+@@ -126,13 +126,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;
+ }
+@@ -469,8 +469,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
+ case E_SYS_HALT:
+ /* 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();
+@@ -496,8 +496,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();
+@@ -522,8 +522,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();
+@@ -548,8 +548,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
+--- 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 = evas_list_append(_thumbnailers_exe, exe);
diff --git a/debian/rules b/debian/rules
index ed86157..937afb3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,20 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
install/enlightenment-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/Vera.COPYING
+ rm debian/tmp/usr/share/enlightenment/data/fonts/*
+ mkdir -p debian/tmp/usr/share/lintian/overrides
+ cp debian/enlightenment-data.overrides debian/tmp/usr/share/lintian/overrides/enlightenment-data
install/enlightenment::
rm -r debian/tmp/usr/lib/enlightenment/modules/layout
rm -r debian/tmp/usr/lib/enlightenment/modules/wizard
+ mkdir -p debian/tmp/usr/share/lintian/overrides
+ cp debian/enlightenment.overrides debian/tmp/usr/share/lintian/overrides/enlightenment
DEB_DH_STRIP_ARGS := --dbg-package=enlightenment-dbg
DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
--
Enlightenment 17
More information about the Pkg-e-commits
mailing list