6 files changed, 16 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index 36aa42a537..70f995162d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,12 +8,16 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
 
 bin_SCRIPTS = enlightenment-config
 
-EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN enlightenment.spec \
-	     debian/changelog debian/changelog.in debian/copyright \
-	     debian/rules debian/enlightenment.install \
+EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
+             enlightenment.spec.in enlightenment.spec \
+	     debian/changelog \
+	     debian/changelog.in \
+	     debian/control \
+	     debian/copyright \
+	     debian/enlightenment.install \
+	     debian/enlightenment-dev.install \
 	     debian/enlightenment.docs \
-	     debian/libe.install debian/libe-dev.install debian/control \
-	     enlightenment.spec.in
+	     debian/rules
 
 filesdir = $(datadir)/enlightenment/
 files_DATA = AUTHORS COPYING 
diff --git a/debian/changelog.in b/debian/changelog.in
index cb282c0888..0820c0a5a0 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -2,5 +2,5 @@ enlightenment (@VERSION@-1) unstable; urgency=low
 
   * a CVS snapshot release.
 
- -- Blake Barnett <shadoi@soulmachine.net>  Fri, 25 Mar 2005 15:09:23 -0700
+ -- E17 Debian Team <debian@edevelop.org>  Fri, 25 Mar 2005 15:09:23 -0700
 
diff --git a/debian/control b/debian/control
index 9067180f30..0e65c83028 100644
--- a/debian/control
+++ b/debian/control
@@ -10,22 +10,14 @@ Architecture: any
 Section: x11
 Recommends: libevas-engine-xrender
 Suggests: entrance
-Depends: ${shlibs:Depends}, libe, 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
+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
 Description: Enlightenment themes, etc.
  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.
 
-Package: libe
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libenlightenment
-Description: Enlightenment library.
- Enlightenment library that provides functions for module development, etc.
- 
-Package: libe-dev
+Package: enlightenment-dev
 Architecture: any
 Section: devel
 Architecture: any
diff --git a/debian/libe-dev.install b/debian/enlightenment-dev.install
index 96cdf354ef..eb02461d93 100644
--- a/debian/libe-dev.install
+++ b/debian/enlightenment-dev.install
@@ -1,3 +1,6 @@
 debian/tmp/usr/bin/enlightenment-config
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/*.a
 debian/tmp/usr/include/*.h
 debian/tmp/usr/include/enlightenment/*.h
diff --git a/debian/enlightenment.install b/debian/enlightenment.install
index d7d8f85fc0..52e4854417 100644
--- a/debian/enlightenment.install
+++ b/debian/enlightenment.install
@@ -1,5 +1,6 @@
 debian/tmp/usr/bin/enlightenment
 debian/tmp/usr/bin/enlightenment_*
+debian/tmp/usr/lib/*.so.*
 debian/tmp/usr/lib/enlightenment/preload/*.so
 debian/tmp/usr/lib/enlightenment/modules/battery/*/*.so
 debian/tmp/usr/lib/enlightenment/modules/battery/*.png
diff --git a/debian/libe.install b/debian/libe.install
deleted file mode 100644
index 965fda4c6e..0000000000
--- a/debian/libe.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libe*