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

Thu May 1 11:54:11 UTC 2008

The following commit has been merged in the master branch:
commit a346d8b7abf85977253f35a306a0dde693d3340f
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Thu May 1 13:49:05 2008 +0200

    Rename the packages from enlightenment to e17

diff --git a/debian/README.Debian b/debian/README.Debian
index 0c78883..0139bde 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,14 +1,11 @@
 Enlightenment DR0.17
 --------------------
 About the menu files
-  Enlightenment handles the menus the same way as gnome or kde, that means, a
-  full compliance with the FDO specs. In order to have menus, you have to use
-  a .menu file. The enlightenment-data package provides an exemple file in
-  /etc/xdg/menus/enlightenment-applications.menu.
-  If you want to use it, copy it to $HOME/.config/menus/applications.menu, or
-  symlink it. You can also renames it to /etc/xdg/menus/applications.menu if
-  this file does not exist yet.
+  Enlightenment handles the menus according to the FDO menu specification.
+  In order to have an 'Applications' menu, you need to use a .menu file.
   Please see http://wiki.enlightenment.org/index.php/E17_and_Efreet for further
   information.
+  If no menu is found, then /etc/xdg/menus/enlightement-applications.menu,
+  provided by the 'e17-data', package, will be used as a fallback
 
-  -- Albin Tonnerre <albin.tonnerre at gmail.com>  Sun, 21 Oct 2007 23:30:27 +0200
+  -- Albin Tonnerre <albin.tonnerre at gmail.com>  Thu, 01 May 2008 12:58:45 +0200
diff --git a/debian/control b/debian/control
index 00660db..c1bc033 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,10 @@ Build-Depends: debhelper (>= 6), cdbs, libeet-dev, libembryo-dev,
  libecore-dev, libedbus-dev, libxext-dev
 Standards-Version: 3.7.3
 
-Package: enlightenment
+Package: e17
 Architecture: any
-Depends: ${shlibs:Depends}, enlightenment-data (= ${source:Version}), libevas-engines
+Depends: ${shlibs:Depends}, e17-data (= ${source:Version}), libevas-engines
+Conflicts: enlightenment
 Provides: x-window-manager
 Description: The Enlightenment DR17 Window Manager
  Enlightenment is an advanced window manager for X11. Unique
@@ -21,9 +22,10 @@ Description: The Enlightenment DR17 Window Manager
  .
  This package contains the core files for Enlightenment DR17.
 
-Package: enlightenment-data
+Package: e17-data
 Architecture: all
-Enhances: enlightenment (>= 0.16.999)
+Enhances: e17
+Conflicts: enlightenment-data
 Description: Enlightenment Window Manager Run Time Data Files
  Enlightenment is an advanced window manager for X11. Unique
  features include: a fully animated background, nice drop shadows
@@ -31,12 +33,12 @@ Description: Enlightenment Window Manager Run Time Data Files
  foundation of APIs.
  .
  These are the architecture independent runtime support files for the
- Enlightenment Window Manager package.
+ Enlightenment DR17 Window Manager.
 
-Package: enlightenment-dev
+Package: e17-dev
 Architecture: any
 Section: devel
-Depends: enlightenment (= ${binary:Version}), efl-dev
+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
@@ -49,7 +51,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-dev, libedbus-dev
+Depends: libeet-dev, libevas-dev, libecore-dev, libedje-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
@@ -59,10 +61,10 @@ Description: EFL headers, static libraries and documentation
  This package contains headers, static libraries and documentation for
  the enlightenment foundation librairies.
 
-Package: enlightenment-dbg
+Package: e17-dbg
 Architecture: any
 Section: devel
-Depends: enlightenment (= ${binary:Version})
+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/copyright b/debian/copyright
index a788ce8..39df852 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -78,9 +78,8 @@ License:
 Files: debian/*
 Copyright: © 2006-2008 Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
 License: GPL-2+
- The Debian packaging information licensed is under the GPL, version 2 or
+ The Debian packaging information is licensed under the GPL, version 2 or
  later.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License (version 2) can be found in `/usr/share/common-licenses/GPL-2'.
-
diff --git a/debian/enlightenment-data.doc-base b/debian/e17-data.doc-base
similarity index 100%
rename from debian/enlightenment-data.doc-base
rename to debian/e17-data.doc-base
diff --git a/debian/enlightenment-data.install b/debian/e17-data.install
similarity index 100%
rename from debian/enlightenment-data.install
rename to debian/e17-data.install
diff --git a/debian/enlightenment-data.overrides b/debian/e17-data.overrides
similarity index 100%
rename from debian/enlightenment-data.overrides
rename to debian/e17-data.overrides
diff --git a/debian/enlightenment-dev.install b/debian/e17-dev.install
similarity index 100%
rename from debian/enlightenment-dev.install
rename to debian/e17-dev.install
diff --git a/debian/enlightenment.install b/debian/e17.install
similarity index 100%
rename from debian/enlightenment.install
rename to debian/e17.install
diff --git a/debian/enlightenment.overrides b/debian/e17.overrides
similarity index 100%
rename from debian/enlightenment.overrides
rename to debian/e17.overrides
diff --git a/debian/enlightenment.postinst b/debian/e17.postinst
similarity index 100%
rename from debian/enlightenment.postinst
rename to debian/e17.postinst
diff --git a/debian/enlightenment.prerm b/debian/e17.prerm
similarity index 100%
rename from debian/enlightenment.prerm
rename to debian/e17.prerm
diff --git a/debian/rules b/debian/rules
index 937afb3..428a488 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,18 +4,18 @@ 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::
+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/*
 	mkdir -p debian/tmp/usr/share/lintian/overrides
-	cp debian/enlightenment-data.overrides debian/tmp/usr/share/lintian/overrides/enlightenment-data
+	cp debian/e17-data.overrides debian/tmp/usr/share/lintian/overrides/e17-data
 
-install/enlightenment::
+install/e17::
 	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
+	cp debian/e17.overrides debian/tmp/usr/share/lintian/overrides/e17
 
-DEB_DH_STRIP_ARGS := --dbg-package=enlightenment-dbg
+DEB_DH_STRIP_ARGS := --dbg-package=e17-dbg
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath

-- 
Enlightenment 17

