[Pkg-e-commits] [SCM] Enlightenment 17 branch, upstream-vcs, updated. a8698069ec4eec9c2a189198fa5eec9854b168ac

[kaethorn]

The following commit has been merged in the upstream-vcs branch:
commit f6ad22161e97eb53e4fc5554f9959336d93e069c
Author: kaethorn <kaethorn>
Date:   Mon Apr 28 15:10:25 2008 +0000

    Make E17 compatible with packages from PkgE.

diff --git a/debian/changelog.in b/debian/changelog.in
index e7e648f..117f9a0 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -2,5 +2,5 @@ enlightenment (1:@VERSION at -1) unstable; urgency=low
 
   * a CVS snapshot release.
 
- -- E17 Debian Team <debian at edevelop.org>  Fri, 25 Mar 2005 15:09:23 -0700
+ -- Falko Schmidt <falko at alphagemini.org>  Mon, 28 Apr 2008 16:17:17 +0000
 
diff --git a/debian/control b/debian/control
index 3dfb062..90f0a6b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,16 @@
 Source: enlightenment
 Section: x11
 Priority: optional
-Maintainer: E17 Debian Team <debian at edevelop.org>
-Build-Depends: cdbs, debhelper (>= 5), libevas-dev, libecore-dev, libeet-dev, libedje-dev, edje-bin, libembryo-dev, libefreet-dev, libx11-dev, x-dev, libxext-dev
-Standards-Version: 3.7.2
+Maintainer: Falko Schmidt <falko at alphagemini.org>
+Build-Depends: cdbs, debhelper (>= 6), libevas-dev, libecore-dev, libeet-dev, libedje-dev, libedje-bin, libembryo-dev, libefreet-dev, libx11-dev, libedbus-dev
+Standards-Version: 3.7.3
+Homepage: http://www.enlightenment.org
 
 Package: enlightenment
-Architecture: any
 Section: x11
-Recommends: libevas-engine-xrender, libe-dbus, libe-ebus-bin
+Architecture: any
+Depends: ${shlibs:Depends}
 Suggests: entrance
-Depends: ${shlibs:Depends}, libevas, libecore, libecore-con, libecore-evas, libecore-file, libecore-ipc, libecore-job, libecore-txt, libecore-x, libeet, libembryo, embryo-bin, edje-bin, libedje, 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, libefreet
-Provides: e17-core
 Description: Enlightenment themes, etc.
  Enlightenment is an advanced window manager for X11. Unique
  features include: a fully animated background, nice drop shadows
@@ -21,36 +20,14 @@ Description: Enlightenment themes, etc.
 Package: enlightenment-dev
 Architecture: any
 Section: devel
-Depends: libevas-dev, libecore-dev, libeet-dev, libembryo-dev, libedje-dev
-Conflicts: libenlightenment-dev
-Provides: e17-devel, efl-devel, efl-dev
+Depends: enlightenment (= ${Source-Version}), libevas-dev, libecore-dev, libeet-dev, libedje-dev, libembryo-dev, libefreet-dev, libedbus-dev
 Description: Enlightenment headers, static libraries and documentation
  Headers, static libraries and documentation for enlightenment.
 
-Package: e17-libs
-Architecture: any
-Section: x11
-Depends: libevas0, libecore0, libeet0, libembryo0, libedje0
-Provides: efl-libs, efl
-Description: Virtual package providing the libraries needed by E17
- Enlightenment is an advanced window manager for X11. Unique
- features include: a fully animated background, nice drop shadows
- around windows, backed by an extremely clean and optimized
- foundation of APIs.
- .
- This virtual package provides the libraries necessary for
- running E17:
-  * Evas - Enlightenment advanced canvas library
-  * Ecore - Core abstraction layer for Enlightenment
-  * Eet - Enlightenment file chunk reading/writing library
-  * Embryo - SMALL-based abstract machine (AMX) bytecode interpreter
-  * Ejde - Graphical layout and animation library.
-
 Package: e17
 Architecture: any
 Section: x11
-Depends: enlightenment, e17-libs, e17-modules
-Suggests: e17-extras
+Depends: enlightenment (>= 0.16.999.000), e17-modules
 Description: Virtual package providing the E17 desktop shell 
  Enlightenment is an advanced window manager for X11. Unique
  features include: a fully animated background, nice drop shadows
@@ -58,70 +35,5 @@ Description: Virtual package providing the E17 desktop shell
  foundation of APIs.
  .
  This virtual package provides all you need to run E17:
-  * E17 windowmanager
-  * E17 modules
-  * E17 tools.
-
-Package: e17-devel-extras
-Architecture: any
-Section: x11
-Depends: enlightenment-dev, libesmart0-dev, libewl0-dev, libetk0-dev, libenhance0-dev, libepsilon0-dev, libevfs0-dev, libentrance0-edit-dev, libentrance0-widgets-dev, libemotion0-dev, libepeg0
-Provides: efl-devel-extras
-Description: Virtual package providing additional E17 dev packages
- Enlightenment is an advanced window manager for X11. Unique
- features include: a fully animated background, nice drop shadows
- around windows, backed by an extremely clean and optimized
- foundation of APIs.
- .
- This virtual package provides headers, static libraries and documentation
- for the following libraries:
-  * Enlightenment Foundation Libraries
-  * Esmart - The Esmart Prototype Library
-  * Epsilon - Enlightenment thumbnailing library
-  * Epeg - Enlightenment jpeg thumbnailer library
-  * Emotion - Enlightenment video playback library
-  * Ewl - The Enlightened Widget Library
-  * Etk - A widget toolkit based on the Enlightenment Foundation Libraries
-  * Enhance - Library for easy application GUI development
-  * Entrance-widgets - Entrance widget library
-  * Evfs - Enlightenment virtual filesystem header files.
-
-Package: e17-extras
-Architecture: any
-Section: x11
-Depends: exhibit, entropy, edje-viewer, empower, extrackt, emphasis, ephoto, entrance, entrance-edit-gui
-Suggests: enlightenment
-Description: Virtual package providing extras for the E17 window manager
- Enlightenment is an advanced window manager for X11. Unique
- features include: a fully animated background, nice drop shadows
- around windows, backed by an extremely clean and optimized
- foundation of APIs.
- .
- This virtual package provides some applications based on the
- Enlightenment Foundation Libraries:
-  * exhibit - the Etk image viewer
-  * entropy - file manager based on Etk 
-  * edje-viewer - A simple viewer for edje files
-  * empower - graphical sudo tool
-  * extrackt - an audio CD ripper and encoder
-  * emphasis - MPD client
-  * ephoto - A slideshow creator with audio-support
-  * entrance - The Enlightened Login Manager & tools.
-
-Package: e17-desktop
-Architecture: any
-Section: x11
-Depends: e17, e17-modules, entrance, entrance-edit-gui
-Suggests: e17-extras
-Description: Virtual package providing the E17 desktop environment
- Enlightenment is an advanced window manager for X11. Unique
- features include: a fully animated background, nice drop shadows
- around windows, backed by an extremely clean and optimized
- foundation of APIs.
- .
- This virtual package provides everythinh necessary to run E17 as
- your main desktop environment:
-  * E17 window manager
-  * E17 modules
-  * Enlightened Login Manager & tools.
-
+  * the E17 windowmanager
+  * all E17 modules.
diff --git a/debian/rules b/debian/rules
index 7c2ddb5..818af3b 100644
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_FIXPERMS_EXCLUDE := enlightenment_sys freqset tempget batget
+DEB_MAKE_CLEAN_TARGET := clean
 
 install/enlightenment::
 	mkdir debian/enlightenment/etc
@@ -14,5 +15,5 @@ install/enlightenment::
 	chmod 4555 debian/tmp/usr/bin/enlightenment_sys
 
 clean::
-	./autogen.sh --prefix=/usr
+	./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS)
 	

-- 
Enlightenment 17