[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[E-devel] Larger diff against CVS concernig autofoo and debian/*



Hi all!

I'm building debian packages of e17 for my private use for a couple of
months now. During that, I had to change some of the autofoo and
debian/* files to make the packages build correctly.

I asked on #edevelop where to send these diffs, Lutin told me to put
them here.

So here they are.

Cheers,
sur5r
? e17/libs/evas/debian/libevas0-engine-directfb.install
? e17/proto/enhance/COPYING
? e17/proto/entropy/src/include/Makefile.am
? e17/proto/exhibit/data/images/Makefile.am
? e17/proto/extrackt/COPYING
? e17/proto/extrackt/data/etk_fe/images/Makefile.am
? e_modules/devian/Makefile.in
? e_modules/devian/aclocal.m4
? e_modules/devian/autom4te.cache
? e_modules/devian/config.guess
? e_modules/devian/config.h.in
? e_modules/devian/config.log
? e_modules/devian/config.sub
? e_modules/devian/configure
? e_modules/devian/depcomp
? e_modules/devian/install-sh
? e_modules/devian/libtool
? e_modules/devian/ltmain.sh
? e_modules/devian/missing
? e_modules/devian/data/Makefile.in
? e_modules/devian/data/images/Makefile.in
? e_modules/devian/data/themes/Makefile.in
? e_modules/devian/data/themes/blue_eyed/Makefile.in
? e_modules/devian/data/themes/clean/Makefile.in
? e_modules/devian/data/themes/minimal/Makefile.in
? e_modules/devian/src/Makefile.in
? e_modules/devian/src/module/Makefile.in
Index: e17/apps/e/data/themes/images/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/apps/e/data/themes/images/Makefile.am,v
retrieving revision 1.84
diff -u -r1.84 Makefile.am
--- e17/apps/e/data/themes/images/Makefile.am	11 Oct 2006 14:41:27 -0000	1.84
+++ e17/apps/e/data/themes/images/Makefile.am	17 Oct 2006 15:50:09 -0000
@@ -485,6 +485,7 @@
 e17_shelf_menu_bar.png \
 e17_shelf_panel.png \
 e17_shelf_top_desk.png \
+e17_icon_background.png \
 e17_busy-1.png \
 e17_busy-2.png \
 e17_busy-3.png \
Index: e17/apps/e/debian/changelog.in
===================================================================
RCS file: /var/cvs/e/e17/apps/e/debian/changelog.in,v
retrieving revision 1.3
diff -u -r1.3 changelog.in
--- e17/apps/e/debian/changelog.in	21 Apr 2006 08:19:28 -0000	1.3
+++ e17/apps/e/debian/changelog.in	17 Oct 2006 15:50:09 -0000
@@ -1,4 +1,4 @@
-enlightenment (@VERSION@-1) unstable; urgency=low
+enlightenment (1:@VERSION@-1) unstable; urgency=low
 
   * a CVS snapshot release.
 
Index: e17/apps/e/debian/rules
===================================================================
RCS file: /var/cvs/e/e17/apps/e/debian/rules,v
retrieving revision 1.14
diff -u -r1.14 rules
--- e17/apps/e/debian/rules	30 Sep 2006 09:18:56 -0000	1.14
+++ e17/apps/e/debian/rules	17 Oct 2006 15:50:09 -0000
@@ -7,7 +7,7 @@
 
 install/enlightenment::
 	mkdir debian/enlightenment/etc
-	mv debian/tmp/usr/etc/enlightenment debian/enlightenment/etc/
+	mv debian/tmp/etc/enlightenment debian/enlightenment/etc/
 	find debian/tmp/usr/lib/enlightenment/modules/cpufreq/ -name 'freqset' -exec chmod 4755 {} \;
 
 clean::
Index: e17/apps/e_utils/src/bin/e17genmenu/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/apps/e_utils/src/bin/e17genmenu/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- e17/apps/e_utils/src/bin/e17genmenu/Makefile.am	5 Sep 2006 16:35:18 -0000	1.6
+++ e17/apps/e_utils/src/bin/e17genmenu/Makefile.am	17 Oct 2006 15:50:09 -0000
@@ -11,7 +11,8 @@
 
 AM_CFLAGS =\
 	 -Wall\
-	 -g
+	 -g \
+	 -DMAX_PATH=PATH_MAX
 
 bin_PROGRAMS = e17genmenu
 
Index: e17/apps/eclair/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/apps/eclair/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- e17/apps/eclair/Makefile.am	10 Oct 2005 20:11:06 -0000	1.3
+++ e17/apps/eclair/Makefile.am	17 Oct 2006 15:50:10 -0000
@@ -29,4 +29,4 @@
 EXTRA_DIST = README AUTHORS COPYING TODO NEWS \
 		debian/changelog debian/changelog.in \
 		debian/rules debian/control debian/copyright \
-		debian/eclair.files debian/docs
+		debian/docs
Index: e17/apps/entrance/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/apps/entrance/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- e17/apps/entrance/Makefile.am	13 Aug 2006 04:18:26 -0000	1.13
+++ e17/apps/entrance/Makefile.am	17 Oct 2006 15:50:10 -0000
@@ -10,6 +10,9 @@
 	debian/entrance.postrm debian/entrance.prerm \
 	debian/entrance.config debian/etc/pam debian/etc/init \
 	debian/etc/Xsession m4/ac_expand_dir.m4 m4/ac_path_generic.m4 \
+	debian/entrance.install \
+	debian/libentrance0-edit.install \
+	debian/libentrance0-edit-dev.install \
 	debian/entrance.templates entrance.spec.in
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
Index: e17/apps/entrance/debian/rules
===================================================================
RCS file: /var/cvs/e/e17/apps/entrance/debian/rules,v
retrieving revision 1.9
diff -u -r1.9 rules
--- e17/apps/entrance/debian/rules	12 Aug 2006 16:04:28 -0000	1.9
+++ e17/apps/entrance/debian/rules	17 Oct 2006 15:50:10 -0000
@@ -6,11 +6,11 @@
 DEB_MAKE_CLEAN_TARGET := clean
 
 install/entrance::
-	./mkinstalldirs debian/entrance/etc/init.d
+	mkdir -p debian/entrance/etc/init.d
 	install -c -m 755 debian/etc/init debian/entrance/etc/init.d/entrance
-	./mkinstalldirs debian/entrance/etc/pam.d
+	mkdir -p debian/entrance/etc/pam.d
 	install -c -m 644 debian/etc/pam debian/entrance/etc/pam.d/entrance
-	./mkinstalldirs debian/entrance/etc/entrance
+	mkdir -p debian/entrance/etc/entrance
 	install -c -m 755 debian/etc/Xsession debian/entrance/etc/entrance/Xsession
 
 clean::
Index: e17/apps/evfs/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/apps/evfs/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- e17/apps/evfs/Makefile.am	5 Apr 2006 11:44:33 -0000	1.3
+++ e17/apps/evfs/Makefile.am	17 Oct 2006 15:50:10 -0000
@@ -15,13 +15,16 @@
 	     debian/evfs0-debug.install \
 	     debian/libevfs0-dev.install \
 	     debian/libevfs0.install \
-	     debian/libevfs0-plugin-bzip2.install \
-	     debian/libevfs0-plugin-ftp.install \
-	     debian/libevfs0-plugin-gzip.install \
-	     debian/libevfs0-plugin-posix.install \
-	     debian/libevfs0-plugin-samba.install \
-	     debian/libevfs0-plugin-sftp.install \
-	     debian/libevfs0-plugin-tar.install \
+	     debian/libevfs0-plugin-file-bzip2.install \
+	     debian/libevfs0-plugin-file-ftp.install \
+	     debian/libevfs0-plugin-file-gzip.install \
+	     debian/libevfs0-plugin-file-posix.install \
+	     debian/libevfs0-plugin-file-samba.install \
+	     debian/libevfs0-plugin-file-sftp.install \
+	     debian/libevfs0-plugin-file-tar.install \
+		 debian/libevfs0-plugin-meta-extractor-tagger.install \
+		 debian/libevfs0-plugin-vfolder-group.install \
+		 debian/libevfs0-plugin-vfolder-trash.install \
 	     debian/rules \
 	     debian/changelog.in \
 	     debian/changelog 
Index: e17/apps/evfs/debian/control
===================================================================
RCS file: /var/cvs/e/e17/apps/evfs/debian/control,v
retrieving revision 1.6
diff -u -r1.6 control
--- e17/apps/evfs/debian/control	12 Aug 2006 16:55:05 -0000	1.6
+++ e17/apps/evfs/debian/control	17 Oct 2006 15:50:10 -0000
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: E17 Debian Team <debian@edevelop.org>
-Build-Depends: automake1.7, libtool, autotools-dev, debhelper (>= 4.0.0), libsmbclient-dev, libxml2-dev, libecore-dev, libcurl3-dev, libbz2-dev, libeet-dev, libx11-dev, libxrender-dev, libssl-dev, libxcursor-dev, libxss-dev, libxinerama-dev, libxrandr-dev, libxp-dev, zlib1g-dev, libsqlite3-dev, libextractor-dev
+Build-Depends: automake1.7 | automaken, libtool, autotools-dev, debhelper (>= 4.0.0), libsmbclient-dev, libxml2-dev, libecore-dev, libcurl3-dev, libbz2-dev, libeet-dev, libx11-dev, libxrender-dev, libssl-dev, libxcursor-dev, libxss-dev, libxinerama-dev, libxrandr-dev, libxp-dev, zlib1g-dev, libsqlite3-dev, libextractor-dev
 Standards-Version: 3.6.2
 
 Package: libevfs0
Index: e17/apps/evfs/src/include/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/apps/evfs/src/include/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- e17/apps/evfs/src/include/Makefile.am	28 Aug 2006 03:32:42 -0000	1.11
+++ e17/apps/evfs/src/include/Makefile.am	17 Oct 2006 15:50:10 -0000
@@ -20,5 +20,8 @@
 			evfs_operation_tasks.h \
 			evfs_vfolder.h \
 			evfs_metadata.h \
+			evfs_metadata_db.h \
 			evfs_trash.h \
 			tarpet.h
+
+EXTRA_DIST = $(installed_headers_DATA)
Index: e17/apps/examine/debian/control
===================================================================
RCS file: /var/cvs/e/e17/apps/examine/debian/control,v
retrieving revision 1.4
diff -u -r1.4 control
--- e17/apps/examine/debian/control	2 Apr 2006 08:34:50 -0000	1.4
+++ e17/apps/examine/debian/control	17 Oct 2006 15:50:10 -0000
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Blake Barnett <shadoi@soulmachine.net>
-Build-Depends: debhelper (>> 3.0.0), automake1.7 | automaken, libecore0-dev, libewl0-dev
+Build-Depends: debhelper (>> 3.0.0), automake1.7 | automaken, libecore0-dev, libewl0-dev, libreadline-dev
 Standards-Version: 3.5.7.0
 
 Package: examine
Index: e17/libs/ecore/debian/control
===================================================================
RCS file: /var/cvs/e/e17/libs/ecore/debian/control,v
retrieving revision 1.35
diff -u -r1.35 control
--- e17/libs/ecore/debian/control	11 Aug 2006 13:45:39 -0000	1.35
+++ e17/libs/ecore/debian/control	17 Oct 2006 15:50:12 -0000
@@ -98,7 +98,7 @@
 Package: libecore0-file
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}), libcurl3, libfam0 | libfam0c102 | libgamin0
+Depends: ${shlibs:Depends}, libecore0 (= ${Source-Version}), libcurl3
 Provides: libecore-file
 Description: Ecore File Library
  This is the core event abstraction layer and X abstraction layer that makes
Index: e17/libs/ecore/debian/rules
===================================================================
RCS file: /var/cvs/e/e17/libs/ecore/debian/rules,v
retrieving revision 1.11
diff -u -r1.11 rules
--- e17/libs/ecore/debian/rules	7 Apr 2006 16:54:43 -0000	1.11
+++ e17/libs/ecore/debian/rules	17 Oct 2006 15:50:12 -0000
@@ -6,6 +6,6 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_MAKE_CLEAN_TARGET := clean
-DEB_CONFIGURE_EXTRA_FLAGS :=  --disable-ecore-evas-dfb --disable-ecore-dfb
+DEB_CONFIGURE_EXTRA_FLAGS :=  --disable-ecore-evas-dfb --disable-ecore-dfb --enable-ecore-fb
 clean::
 	if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr --disable-ecore-evas-dfb --disable-ecore-dfb; fi
Index: e17/libs/edje/debian/control
===================================================================
RCS file: /var/cvs/e/e17/libs/edje/debian/control,v
retrieving revision 1.17
diff -u -r1.17 control
--- e17/libs/edje/debian/control	20 Apr 2006 11:12:29 -0000	1.17
+++ e17/libs/edje/debian/control	17 Oct 2006 15:50:12 -0000
@@ -48,6 +48,7 @@
 Section: libdevel
 Architecture: any
 Depends: libedje0 (= ${Source-Version}), libeet-dev, libecore-dev, libevas-dev, libembryo-dev
+Suggests: edje0-bin (= ${Source-Version})
 Provides: libedje-dev
 Description: Edje headers, static libraries and documentation
  Edje is a graphical layout and animation library for animated resizable,
Index: e17/libs/emotion/debian/control
===================================================================
RCS file: /var/cvs/e/e17/libs/emotion/debian/control,v
retrieving revision 1.9
diff -u -r1.9 control
--- e17/libs/emotion/debian/control	22 Apr 2006 12:49:12 -0000	1.9
+++ e17/libs/emotion/debian/control	17 Oct 2006 15:50:12 -0000
@@ -1,7 +1,7 @@
 Source: emotion
 Priority: optional
 Maintainer: E17 Debian Team <debian@edevelop.org>
-Build-Depends: debhelper (>= 4.0.0), libeet-dev, libevas-dev, libedje-dev, libecore-dev, libembryo-dev, libxine-dev (>=1.1.0), automake1.9 | automaken, libtool, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, gstreamer0.10-ffmpeg, gstreamer0.10-plugins-good, gstreamer0.10-tools
+Build-Depends: debhelper (>= 4.0.0), libeet-dev, libevas-dev, libedje-dev, edje-bin, libecore-dev, libembryo-dev, libxine-dev (>=1.1.0), automake1.9 | automaken, libtool, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, gstreamer0.10-ffmpeg, gstreamer0.10-plugins-good, gstreamer0.10-tools
 Standards-Version: 3.6.2.2
 
 Package: libemotion0
Index: e17/libs/engrave/debian/control
===================================================================
RCS file: /var/cvs/e/e17/libs/engrave/debian/control,v
retrieving revision 1.7
diff -u -r1.7 control
--- e17/libs/engrave/debian/control	14 Apr 2006 00:24:36 -0000	1.7
+++ e17/libs/engrave/debian/control	17 Oct 2006 15:50:12 -0000
@@ -8,7 +8,7 @@
 Package: libengrave0-dev
 Section: libdevel
 Architecture: any
-Depends: libecore0-dev, libevas0-dev, libeet0-dev
+Depends: libengrave0 (= ${Source-Version}), libecore0-dev, libevas0-dev, libeet0-dev
 Provides: libengrave-dev
 Conflicts: libengrave-dev
 Description: Enlightenment edje EDC parsing library development files
Index: e17/libs/esmart/src/lib/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/libs/esmart/src/lib/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- e17/libs/esmart/src/lib/Makefile.am	29 Oct 2005 11:14:00 -0000	1.3
+++ e17/libs/esmart/src/lib/Makefile.am	17 Oct 2006 15:50:13 -0000
@@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 SUBDIRS = \
 			 esmart_container \
 			 esmart_draggies \
Index: e17/libs/evas/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/libs/evas/Makefile.am,v
retrieving revision 1.34
diff -u -r1.34 Makefile.am
--- e17/libs/evas/Makefile.am	28 Jun 2006 07:20:16 -0000	1.34
+++ e17/libs/evas/Makefile.am	17 Oct 2006 15:50:13 -0000
@@ -31,15 +31,21 @@
 	     debian/libevas0-engine-fb.install \
 	     debian/libevas0-engine-software-generic.install \
 	     debian/libevas0-engine-software-x11.install \
+		 debian/libevas0-engine-gl-x11.install \
 	     debian/libevas0-engine-xrender.install \
 	     debian/libevas0-engines-all.install \
 	     debian/libevas0-loader-eet.install \
+		 debian/libevas0-loader-gif.install \
 	     debian/libevas0-loader-jpeg.install \
 	     debian/libevas0-loader-png.install \
+		 debian/libevas0-loader-svg.install \
+		 debian/libevas0-loader-tiff.install \
+		 debian/libevas0-loader-xpm.install \
 	     debian/libevas0-loaders-all.install \
 	     debian/libevas0-saver-eet.install \
 	     debian/libevas0-saver-jpeg.install \
 	     debian/libevas0-saver-png.install \
+		 debian/libevas0-saver-tiff.install \
 	     debian/libevas0-savers-all.install \
 	     debian/libevas0.install \
 	     debian/rules
Index: e17/libs/evas/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/evas/configure.in,v
retrieving revision 1.183
diff -u -r1.183 configure.in
--- e17/libs/evas/configure.in	15 Oct 2006 15:41:17 -0000	1.183
+++ e17/libs/evas/configure.in	17 Oct 2006 15:50:13 -0000
@@ -1,4 +1,4 @@
-bn# get rid of that stupid cache mechanism
+# get rid of that stupid cache mechanism
 rm -f config.cache
 
 AC_INIT(configure.in)
@@ -394,8 +394,9 @@
     ],
     [ have_evas_gl_x11="no" ]
 )
-## manually disable gl engine by default - not auto detected.
-have_evas_gl_x11="no"
+# ## manually disable gl engine by default - not auto detected.
+# auto detect
+have_evas_gl_x11="yes"
 ## Manual override
 AC_MSG_CHECKING(whether gl x11 backend is to be built)
 AC_ARG_ENABLE(gl-x11, [  --enable-gl-x11                 enable the OpenGL X11 display engine], [
Index: e17/libs/evas/debian/control
===================================================================
RCS file: /var/cvs/e/e17/libs/evas/debian/control,v
retrieving revision 1.31
diff -u -r1.31 control
--- e17/libs/evas/debian/control	17 Aug 2006 17:50:35 -0000	1.31
+++ e17/libs/evas/debian/control	17 Oct 2006 15:50:13 -0000
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: E17 Debian Team <debian@edevelop.org>
-Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), automake1.7 | automaken, libtool, libeet-dev, libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | xlibs-dev, libxrender-dev | xlibs-dev, zlib1g, libjpeg62-dev, autotools-dev, libtiff4-dev, libungif4-dev, libxpm-dev, libgl-dev, librsvg2-dev
+Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), automake1.7 | automaken, libtool, libeet-dev, libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | x-dev, libxrender-dev | x-dev, zlib1g, libjpeg62-dev, autotools-dev, libtiff4-dev, libungif4-dev, pkg-config, x11proto-gl-dev, libgl1-mesa-dev, libglu1-mesa-dev, libxpm-dev, libgl1-mesa-dev | libgl-dev, librsvg2-dev
 Standards-Version: 3.6.2.2
 
 Package: libevas0
@@ -59,7 +59,7 @@
  hardware-accelerated canvas library, or if you want to try out the
  applications under development.
  This package contains the Evas engine module for framebuffer rendering.
- 
+
 Package: libevas0-engine-software-x11
 Section: libs
 Architecture: any
Index: e17/libs/ewl/debian/rules
===================================================================
RCS file: /var/cvs/e/e17/libs/ewl/debian/rules,v
retrieving revision 1.10
diff -u -r1.10 rules
--- e17/libs/ewl/debian/rules	13 Oct 2006 11:58:46 -0000	1.10
+++ e17/libs/ewl/debian/rules	17 Oct 2006 15:50:13 -0000
@@ -15,4 +15,4 @@
 
 install/libewl0::
 	mkdir -p debian/libewl0/etc/ewl
-	mv debian/tmp/usr/etc/ewl/ewl.cfg debian/libewl0/etc/ewl/
+	mv debian/tmp/etc/ewl/ewl.cfg debian/libewl0/etc/ewl/
Index: e17/libs/exml/debian/control
===================================================================
RCS file: /var/cvs/e/e17/libs/exml/debian/control,v
retrieving revision 1.2
diff -u -r1.2 control
--- e17/libs/exml/debian/control	27 Jun 2006 15:28:36 -0000	1.2
+++ e17/libs/exml/debian/control	17 Oct 2006 15:50:13 -0000
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: E17 Debian Team <debian@edevelop.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libecore-dev, libxml2-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libecore-dev, libxml2-dev, libxslt1-dev
 Standards-Version: 3.6.2.2
 
 Package: libexml0
Index: e17/libs/imlib2/debian/control
===================================================================
RCS file: /var/cvs/e/e17/libs/imlib2/debian/control,v
retrieving revision 1.18
diff -u -r1.18 control
--- e17/libs/imlib2/debian/control	27 Jun 2006 15:09:13 -0000	1.18
+++ e17/libs/imlib2/debian/control	17 Oct 2006 15:50:13 -0000
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Laurence J. Lane <ljlane@debian.org>
-Build-Depends: libjpeg62-dev, libttf-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, libungif4-dev | libungif3g-dev | giflib3g-dev, x11proto-core-dev | xlibs-dev, x11proto-xext-dev | xlibs-dev, libfreetype6-dev | freetype2-dev, libbz2-dev, libltdl3-dev, automake1.7 | automaken, libtool, debhelper (>= 4.0)
+Build-Depends: libjpeg62-dev, libttf-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, libungif4-dev | libungif3g-dev | giflib3g-dev, x11proto-core-dev | xlibs-dev, x11proto-xext-dev | xlibs-dev, libfreetype6-dev | freetype2-dev, libbz2-dev, libltdl3-dev, automake1.7 | automaken, libtool, debhelper (>= 4.0), xorg-dev, libid3tag0-dev
 Standards-Version: 3.6.2.2
 
 Package: imlib2-demo
@@ -39,6 +39,6 @@
 Architecture: any
 Section: libdevel
 Architecture: any
-Depends: libimlib2 (= ${Source-Version}), libjpeg62-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, libttf-dev, libungif4-dev | libungif3g-dev | giflib3g-dev, x11proto-core-dev | xlibs-dev, x11proto-xext-dev | xlibs-dev, libfreetype6-dev | freetype2-dev, libbz2-dev
+Depends: libimlib2 (= ${Source-Version}), libjpeg62-dev, libpng3-dev | libpng2-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, libttf-dev, libungif4-dev | libungif3g-dev | giflib3g-dev, x11proto-core-dev | xlibs-dev, x11proto-xext-dev | xlibs-dev, libfreetype6-dev | freetype2-dev, libbz2-dev, xorg-dev
 Description: Imlib2 headers, static libraries and documentation
  Headers, static libraries and documentation for Imlib2.
Index: e17/proto/emphasis/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/emphasis/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- e17/proto/emphasis/Makefile.am	20 Aug 2006 22:48:49 -0000	1.3
+++ e17/proto/emphasis/Makefile.am	17 Oct 2006 15:50:13 -0000
@@ -21,7 +21,6 @@
 EXTRA_DIST = README \
 AUTHORS \
 COPYING \
-COPYING-PLAIN \
 $(MYAPPNAME).c.in \
 gendoc \
 Doxyfile \
Index: e17/proto/emphasis/src/bin/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/emphasis/src/bin/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- e17/proto/emphasis/src/bin/Makefile.am	20 Aug 2006 22:48:49 -0000	1.5
+++ e17/proto/emphasis/src/bin/Makefile.am	17 Oct 2006 15:50:13 -0000
@@ -37,4 +37,6 @@
 
 emphasis_LDADD = @my_libs@
 
+EXTRA_DIST = $(emphasis_INCLUDES)
+
 MAINTAINERCLEANFILES = Makefile.in
Index: e17/proto/enhance/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/enhance/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- e17/proto/enhance/Makefile.am	4 Apr 2006 21:03:02 -0000	1.2
+++ e17/proto/enhance/Makefile.am	17 Oct 2006 15:50:13 -0000
@@ -12,7 +12,9 @@
 	     debian/changelog.in \
 	     debian/control \
 	     debian/copyright \
-	     debian/rules
+	     debian/rules \
+		 debian/libenhance0.install \
+		 debian/libenhance0-dev.install
 		
 SUBDIRS = src
 
Index: e17/proto/enhance/debian/control
===================================================================
RCS file: /var/cvs/e/e17/proto/enhance/debian/control,v
retrieving revision 1.6
diff -u -r1.6 control
--- e17/proto/enhance/debian/control	27 Jun 2006 15:51:50 -0000	1.6
+++ e17/proto/enhance/debian/control	17 Oct 2006 15:50:13 -0000
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: E17 Debian Team <debian@edevelop.org>
-Build-Depends: debhelper (>= 4.0.0), libexml, libetk-dev
+Build-Depends: debhelper (>= 4.0.0), libexml-dev, libetk-dev
 Standards-Version: 3.6.2.2
 
 Package: libenhance0
@@ -23,7 +23,7 @@
 Package: libenhance0-dev
 Architecture: any
 Section: libdevel
-Depends: libetk, libexml, libenhance0
+Depends: libetk, libexml-dev, libenhance0 (= ${Source-Version})
 Provides: libenhance-dev
 Description: Headers for libenhance0
  After using Glade to design a GUI, you can save generate
Index: e17/proto/enhance/src/lib/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/enhance/src/lib/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- e17/proto/enhance/src/lib/Makefile.am	7 Feb 2006 00:34:32 -0000	1.1
+++ e17/proto/enhance/src/lib/Makefile.am	17 Oct 2006 15:50:13 -0000
@@ -24,3 +24,6 @@
 libenhance_la_LDFLAGS = -export-dynamic
 libenhance_la_LIBADD = $(INTLLIBS) \
 		       @my_libs@
+
+EXTRA_DIST = enhance_private.h Enhance.h enhance_widget.h
+
Index: e17/proto/entropy/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/entropy/configure.in,v
retrieving revision 1.12
diff -u -r1.12 configure.in
--- e17/proto/entropy/configure.in	11 Jun 2006 10:23:48 -0000	1.12
+++ e17/proto/entropy/configure.in	17 Oct 2006 15:50:14 -0000
@@ -391,6 +391,7 @@
 Makefile
 images/Makefile
 src/Makefile
+src/include/Makefile
 src/plugins/Makefile
 debian/changelog
 ])
Index: e17/proto/entropy/debian/control
===================================================================
RCS file: /var/cvs/e/e17/proto/entropy/debian/control,v
retrieving revision 1.3
diff -u -r1.3 control
--- e17/proto/entropy/debian/control	17 Sep 2006 21:51:19 -0000	1.3
+++ e17/proto/entropy/debian/control	17 Oct 2006 15:50:14 -0000
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: E17 Debian Team <debian@edevelop.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libecore0-dev, libewl0-dev, libimlib2-dev, libpng12-dev, libevfs0-dev, libetk0-dev, libetk0-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libecore0-dev, libewl0-dev, libimlib2-dev, libpng12-dev, libevfs0-dev, libetk0-dev, libetk0-dev, libextractor-dev
 Standards-Version: 3.7.2
 
 Package: entropy
Index: e17/proto/entropy/src/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/entropy/src/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- e17/proto/entropy/src/Makefile.am	31 Mar 2006 12:12:26 -0000	1.7
+++ e17/proto/entropy/src/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS       = 1.7 foreign
 
-SUBDIRS = plugins
+SUBDIRS = plugins include
 
 INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src/include
 
Index: e17/proto/ephoto/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/ephoto/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- e17/proto/ephoto/Makefile.am	6 Oct 2006 02:22:52 -0000	1.5
+++ e17/proto/ephoto/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src data po
+SUBDIRS = src data
 
 EXTRA_DIST = \
 	README AUTHORS COPYING ephoto.spec \
Index: e17/proto/ephoto/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/ephoto/configure.in,v
retrieving revision 1.10
diff -u -r1.10 configure.in
--- e17/proto/ephoto/configure.in	15 Oct 2006 22:05:35 -0000	1.10
+++ e17/proto/ephoto/configure.in	17 Oct 2006 15:50:14 -0000
@@ -132,5 +132,4 @@
 data/images/Makefile
 src/Makefile
 debian/changelog
-po/Makefile
 ])
Index: e17/proto/estickies/data/themes/default/images/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/estickies/data/themes/default/images/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- e17/proto/estickies/data/themes/default/images/Makefile.am	30 Jul 2006 04:46:29 -0000	1.1
+++ e17/proto/estickies/data/themes/default/images/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -1,5 +1,11 @@
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = stickies.png \
+EXTRA_DIST = \
 button_close.png \
 button_lock.png \
-button_stick.png
+button_stick.png \
+button_down.png \
+button_over.png \
+button_toggled.png \
+button_up.png \
+preview.png \
+sticky.png
Index: e17/proto/estickies/data/themes/mc/images/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/estickies/data/themes/mc/images/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- e17/proto/estickies/data/themes/mc/images/Makefile.am	5 Aug 2006 00:20:16 -0000	1.1
+++ e17/proto/estickies/data/themes/mc/images/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -1,5 +1,13 @@
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = stickies.png \
+EXTRA_DIST = \
 button_close.png \
 button_lock.png \
-button_stick.png
+button_stick.png \
+button_down.png \
+button_over.png \
+button_stick.png \
+button_toggled.png \
+button_up.png \
+preview.png \
+sticky.png \
+watermark.png
Index: e17/proto/estickies/data/themes/postit/images/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/estickies/data/themes/postit/images/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- e17/proto/estickies/data/themes/postit/images/Makefile.am	31 Jul 2006 00:31:45 -0000	1.1
+++ e17/proto/estickies/data/themes/postit/images/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -1,5 +1,12 @@
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = stickies.png \
+EXTRA_DIST = \
 button_close.png \
 button_lock.png \
-button_stick.png
+button_stick.png \
+button_down.png \
+button_over.png \
+button_stick.png \
+button_toggled.png \
+button_up.png \
+preview.png \
+sticky.png
Index: e17/proto/estickies/src/bin/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/estickies/src/bin/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- e17/proto/estickies/src/bin/Makefile.am	4 Aug 2006 04:30:40 -0000	1.3
+++ e17/proto/estickies/src/bin/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -10,6 +10,7 @@
 bin_PROGRAMS = estickies
 
 estickies_INCLUDES = \
+about.h \
 stickies.h \
 conf.h \
 theme_chooser.h
@@ -22,3 +23,4 @@
 $(estickies_INCLUDES)
 
 estickies_LDADD = @my_libs@
+
Index: e17/proto/etk/debian/control
===================================================================
RCS file: /var/cvs/e/e17/proto/etk/debian/control,v
retrieving revision 1.6
diff -u -r1.6 control
--- e17/proto/etk/debian/control	11 Aug 2006 04:07:27 -0000	1.6
+++ e17/proto/etk/debian/control	17 Oct 2006 15:50:14 -0000
@@ -66,7 +66,7 @@
 Package: libetk0-dev
 Architecture: any
 Section: libdevel
-Depends: libevas, libecore, libedje
+Depends: libevas, libecore, libedje, libetk0 (= ${Source-Version})
 Provides: libetk-dev
 Description: Etk headers, static libraries and documentation
  Headers, static libraries and documentation for the ETK widget library.
Index: e17/proto/etk/debian/libetk0.install
===================================================================
RCS file: /var/cvs/e/e17/proto/etk/debian/libetk0.install,v
retrieving revision 1.2
diff -u -r1.2 libetk0.install
--- e17/proto/etk/debian/libetk0.install	30 Jun 2006 04:05:37 -0000	1.2
+++ e17/proto/etk/debian/libetk0.install	17 Oct 2006 15:50:14 -0000
@@ -1,3 +1,4 @@
+debian/tmp/usr/lib/etk/engines/*
 debian/tmp/usr/lib/lib*.so.*
 debian/tmp/usr/share/etk/fonts/*.ttf
 debian/tmp/usr/share/etk/fonts/fonts.alias
Index: e17/proto/etk/src/engines/ecore_evas/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/etk/src/engines/ecore_evas/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- e17/proto/etk/src/engines/ecore_evas/Makefile.am	5 Sep 2006 19:21:57 -0000	1.4
+++ e17/proto/etk/src/engines/ecore_evas/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -19,3 +19,5 @@
 				     -L$(top_builddir)/src/lib \
 		                     -L$(top_builddir)/src/lib/.libs
 ecore_evas_la_DEPENDENCIES =
+
+EXTRA_DIST = Etk_Engine_Ecore_Evas.h
\ No newline at end of file
Index: e17/proto/etk/src/engines/ecore_evas_x11/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- e17/proto/etk/src/engines/ecore_evas_x11/Makefile.am	5 Sep 2006 19:21:57 -0000	1.4
+++ e17/proto/etk/src/engines/ecore_evas_x11/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -23,3 +23,5 @@
 ecore_evas_x11_la_DEPENDENCIES =
 
 endif
+
+EXTRA_DIST = Etk_Engine_Ecore_Evas_X11.h
\ No newline at end of file
Index: e17/proto/etk/src/engines/ecore_fb/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/etk/src/engines/ecore_fb/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- e17/proto/etk/src/engines/ecore_fb/Makefile.am	5 Sep 2006 19:21:57 -0000	1.5
+++ e17/proto/etk/src/engines/ecore_fb/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -23,3 +23,5 @@
 ecore_fb_la_DEPENDENCIES =
 
 endif
+
+EXTRA_DIST = Etk_Engine_Ecore_Fb.h
Index: e17/proto/exhibit/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/exhibit/configure.in,v
retrieving revision 1.9
diff -u -r1.9 configure.in
--- e17/proto/exhibit/configure.in	29 Jul 2006 19:50:04 -0000	1.9
+++ e17/proto/exhibit/configure.in	17 Oct 2006 15:50:14 -0000
@@ -257,6 +257,7 @@
 src/Makefile
 src/bin/Makefile
 data/Makefile
+data/images/Makefile
 debian/changelog
 ],[
 touch exhibit_docs.tar.gz
Index: e17/proto/exhibit/data/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/exhibit/data/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- e17/proto/exhibit/data/Makefile.am	15 Sep 2006 11:30:09 -0000	1.2
+++ e17/proto/exhibit/data/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -1,6 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = gui.edc
 
+SUBDIRS = images
+
 EDJE_CC = edje_cc
 EDJE_FLAGS = \
 -v \
Index: e17/proto/extrackt/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/extrackt/configure.in,v
retrieving revision 1.5
diff -u -r1.5 configure.in
--- e17/proto/extrackt/configure.in	11 Sep 2006 21:32:48 -0000	1.5
+++ e17/proto/extrackt/configure.in	17 Oct 2006 15:50:14 -0000
@@ -239,6 +239,7 @@
 src/bin/etk_fe/Makefile
 data/Makefile
 data/etk_fe/Makefile
+data/etk_fe/images/Makefile
 data/images/Makefile
 debian/changelog
 ])
Index: e17/proto/extrackt/data/etk_fe/Makefile.am
===================================================================
RCS file: /var/cvs/e/e17/proto/extrackt/data/etk_fe/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- e17/proto/extrackt/data/etk_fe/Makefile.am	7 Feb 2006 01:35:13 -0000	1.1
+++ e17/proto/extrackt/data/etk_fe/Makefile.am	17 Oct 2006 15:50:14 -0000
@@ -1,6 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = etk_fe.edc extrackt.glade
 
+SUBDIRS = images
+
 EDJE_CC = edje_cc
 EDJE_FLAGS = \
 -v \
Index: e_modules/debian/control
===================================================================
RCS file: /var/cvs/e/e_modules/debian/control,v
retrieving revision 1.18
diff -u -r1.18 control
--- e_modules/debian/control	17 Sep 2006 23:25:30 -0000	1.18
+++ e_modules/debian/control	17 Oct 2006 15:50:14 -0000
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: E17 Debian Team <debian@edevelop.org>
-Build-Depends: debhelper (>= 4.0.0), enlightenment-dev, libesmart-dev, libembryo-dev, libexml-dev
+Build-Depends: debhelper (>= 4.0.0), enlightenment-dev, libesmart-dev, libembryo-dev, libexml-dev, libasound2-dev, imagemagick, scrot
 Standards-Version: 3.7.2
 
 Package: emodule0-bling
@@ -129,7 +129,7 @@
  
 Package: emodule0-screenshot
 Architecture: any
-Depends: ${shlibs:Depends}, enlightenment
+Depends: ${shlibs:Depends}, enlightenment, imagemagick | scrot
 Provides: emodule-screenshot
 Description: An E17 screenshot module
  An E17 module which enables the user to take screenshots. It contains