[Pkg-e-commits] [SCM] Enlightenment 17 branch, master, updated. c8d629a4a14aa510eddad9587754a26dbe7aa00a

Albin Tonnerre albin.tonnerre at gmail.com
Wed Mar 12 17:39:22 UTC 2008 

The following commit has been merged in the master branch:
commit c8d629a4a14aa510eddad9587754a26dbe7aa00a
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Wed Mar 12 18:39:16 2008 +0100

    Cleanup the packaging. don't want to bother describing them all, look at the diff :p

diff --git a/debian/README.Debian b/debian/README.Debian
index c7dfab8..0c78883 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,22 +11,4 @@ About the menu files
   Please see http://wiki.enlightenment.org/index.php/E17_and_Efreet for further
   information.
 
--------------------
-About the system-wide configuration
-
-  This version is patched to change the way E looks for profiles and
-  configurations.
-  Usually, it just looks in ~/.e/e/config/profile.cfg, extracts the profiles
-  from it (it is a single name, such as 'defaut', 'Home', 'Work' or whatever),
-  and loads it from  ~/.e/e/config/<profile>/<whatever>.cfg
-
-  In this version, it also tries to look in
-    /usr/share/enlightenment/config/profile.cfg
-    /usr/share/enlightenment/config/<profile>/<whatever>.cfg
-  to allow system-wide configurations.
-  Please note that this package does not ship any modified config.
-  If you want to provide your own custom config, you HAVE TO use the
-  alternatives system to point to /usr/share/enlightenment/config/profile.cfg,
-  so that anyone can benefit from this.
-
   -- Albin Tonnerre <albin.tonnerre at gmail.com>  Sun, 21 Oct 2007 23:30:27 +0200
diff --git a/debian/changelog b/debian/changelog
index 3b0360b..b1abc8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-e17 (0.16.999.042-1) experimental; urgency=low
+e17 (0.16.999.042+dfsg-1) experimental; urgency=low
 
-  * Initial Release
+  * Initial Release (Closes: #405860)
 
- -- Albin Tonnerre <albin.tonnerre at gmail.com>  Sun, 05 Aug 2007 11:19:41 +0200
+ -- Albin Tonnerre <albin.tonnerre at gmail.com>  Wed, 12 Mar 2008 18:20:31 +0100
 
diff --git a/debian/control b/debian/control
index 10007a3..00660db 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,7 @@ Standards-Version: 3.7.3
 
 Package: enlightenment
 Architecture: any
-Recommends: libevas-loaders-all
-Suggests: emodules-all
-Depends: ${shlibs:Depends}, enlightenment-data (= ${source:Version}), libevas-loader-eet, libevas-loader-jpeg, libevas-loader-png, libevas-saver-eet, libevas-saver-jpeg, libevas-saver-png, libevas-engine-buffer, libevas-engine-software-x11
+Depends: ${shlibs:Depends}, enlightenment-data (= ${source:Version}), libevas-engines
 Provides: x-window-manager
 Description: The Enlightenment DR17 Window Manager
  Enlightenment is an advanced window manager for X11. Unique
@@ -51,7 +49,7 @@ 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, libefreet-mime-dev, libecore-con-dev, libecore-evas-dev, libecore-file-dev, libecore-ipc-dev, libecore-job-dev, libecore-txt-dev, libecore-x-dev, libedbus-dev
+Depends: libeet-dev, libevas-dev, libecore-dev, libedje-dev, libefreet-dev, libefreet-dev, libedbus-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
diff --git a/debian/enlightenment-data.postinst b/debian/enlightenment-data.postinst
deleted file mode 100644
index 07fff6f..0000000
--- a/debian/enlightenment-data.postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives  --install /usr/share/enlightenment/data/themes/default.edj\
-    enlightenment-theme  /usr/share/enlightenment/data/themes/bling.edj 10
-
-update-alternatives  --install /usr/share/enlightenment/data/init/default.edj\
-    enlightenment-init-theme  /usr/share/enlightenment/data/init/bling.edj 10
-
-#DEBHELPER#
diff --git a/debian/enlightenment-data.prerm b/debian/enlightenment-data.prerm
deleted file mode 100644
index 1512923..0000000
--- a/debian/enlightenment-data.prerm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-  remove|upgrade|failed-upgrade)
-      update-alternatives  --remove enlightenment-theme /usr/share/enlightenment/data/themes/bling.edj
-      update-alternatives  --remove enlightenment-init-theme /usr/share/enlightenment/data/init/bling.edj
-;;
-*)
-;;
-esac
-
-#DEBHELPER#
diff --git a/debian/enlightenment.install b/debian/enlightenment.install
index 83ef3ad..737c054 100644
--- a/debian/enlightenment.install
+++ b/debian/enlightenment.install
@@ -1,8 +1,10 @@
 debian/tmp/usr/bin/enlightenment
 debian/tmp/usr/bin/enlightenment_*
 debian/tmp/etc/enlightenment/sysactions.conf
-debian/tmp/usr/lib/enlightenment/preload/*.so
-debian/tmp/usr/lib/enlightenment/modules/*/linux-gnu-*/*.so
-debian/tmp/usr/lib/enlightenment/modules/*/*.desktop
-debian/tmp/usr/lib/enlightenment/modules/*/*.edj
-debian/tmp/usr/lib/enlightenment/modules/cpufreq/linux-gnu-*/freqset
+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/*/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
diff --git a/debian/enlightenment.postinst b/debian/enlightenment.postinst
index e0c35e4..d7282b2 100644
--- a/debian/enlightenment.postinst
+++ b/debian/enlightenment.postinst
@@ -8,5 +8,7 @@ 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/cpufreq/linux-gnu-*/freqset
+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_system_wide_config.patch b/debian/patches/01_system_wide_config.patch
deleted file mode 100644
index 7df202a..0000000
--- a/debian/patches/01_system_wide_config.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nur enlightenment-0.16.999.041+cvs20071025/src/bin/e_config.c enlightenment-0.16.999.041+cvs20071025.new/src/bin/e_config.c
---- enlightenment-0.16.999.041+cvs20071025/src/bin/e_config.c	2007-10-21 11:23:49.000000000 +0200
-+++ enlightenment-0.16.999.041+cvs20071025.new/src/bin/e_config.c	2007-10-26 13:39:11.000000000 +0200
-@@ -61,6 +61,11 @@
- 	snprintf(buf, sizeof(buf), "%s/.e/e/config/profile.cfg",
- 		 homedir);
- 	ef = eet_open(buf, EET_FILE_MODE_READ);
-+    if (!ef)
-+      {
-+         snprintf(buf, sizeof(buf), "%s/data/config/profile.cfg", e_prefix_data_get());
-+         ef = eet_open(buf, EET_FILE_MODE_READ);
-+      }
- 	if (ef)
- 	  {
- 	     char *data;
-@@ -1796,6 +1801,11 @@
-    snprintf(buf, sizeof(buf), "%s/.e/e/config/%s/%s.cfg",
- 	    homedir, _e_config_profile, domain);
-    ef = eet_open(buf, EET_FILE_MODE_READ);
-+   if (!ef)
-+     {
-+    snprintf(buf, sizeof(buf), "%s/data/config/%s/%s.cfg", e_prefix_data_get(), _e_config_profile, domain);
-+    ef = eet_open(buf, EET_FILE_MODE_READ);
-+     }
-    if (ef)
-      {
- 	data = eet_data_read(ef, edd, "config");
diff --git a/debian/rules b/debian/rules
index dc35221..ed86157 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,15 @@
 
 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
 
 install/enlightenment::
-	rm -R debian/tmp/usr/lib/enlightenment/modules/layout
-	rm -R debian/tmp/usr/lib/enlightenment/modules/wizard
+	rm -r debian/tmp/usr/lib/enlightenment/modules/layout
+	rm -r debian/tmp/usr/lib/enlightenment/modules/wizard
 
 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