Merge -test with -bin and generate changelog.in

 - other minor packaging tweaks

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/e17/libs/emotion@17290 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/Makefile.am b/Makefile.am
index 4e7d09a..61548a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,16 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
                       ltconfig ltmain.sh missing mkinstalldirs \
                       stamp-h.in emotion_docs.tar emotion_docs.tar.gz \
-                      emotion.c acconfig.h
+                      emotion.c acconfig.h debian/changelog
 
 bin_SCRIPTS = emotion-config
 
-EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN emotion.spec emotion.c.in gendoc Doxyfile emotion.pc.in
+EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
+       emotion.spec emotion.c.in gendoc Doxyfile emotion.pc.in \
+       debian/changelog.in debian/changelog debian/control \
+       debian/copyright debian/rules debian/libemotion0.files \
+       debian/libemotion0-dev.files debian/emotion0-bin.files \
+       debian/docs
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = emotion.pc

diff --git a/configure.in b/configure.in
index 693bb25..a590c34 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -204,6 +204,7 @@ src/modules/xine/Makefile
 src/bin/Makefile
 data/Makefile
 emotion-config
+debian/changelog
 ],[
 chmod +x emotion-config
 ])

diff --git a/debian/control b/debian/control
index a9e6e70..cc76b32 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: emotion
 Priority: optional
 Maintainer: Sytse Wielinga <s.b.wielinga@student.utwente.nl>
-Build-Depends: debhelper (>= 4.0.0), libeet0-dev, libevas0-dev, libedje0-dev, libecore0-dev, libembryo0-dev, libxine-dev, automaken, libtool
+Build-Depends: debhelper (>= 4.0.0), libeet-dev, libevas-dev, libedje-dev, libecore-dev, libembryo-dev, libxine-dev, automaken, libtool, libgstreamer0.8-dev
 Standards-Version: 3.6.1.0
 
 Package: libemotion0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Provides: libemotion
 Description: Video playback library used in Enlightenment DR0.17
  This is the emotion library, a wrapper library used in the next-generation
  Enlightenment suite for video playback.
@@ -15,14 +16,16 @@ Description: Video playback library used in Enlightenment DR0.17
 Package: libemotion0-dev
 Section: devel
 Architecture: any
-Depends: libemotion0 (= ${Source-Version}), libc6-dev | libc-dev, libevas0-dev, libecore0-dev
+Depends: libemotion0 (= ${Source-Version}), libc6-dev | libc-dev, libevas-dev, libecore-dev
+Provides: libemotion-dev
 Description: Headers, static libraries and documentation for Emotion
  This package contains development files for the Emotion library, a wrapper
  library used in the next-generation Enlightenment suite for video playback.
 
-Package: emotion0-test
+Package: emotion0-bin
 Section: x11
 Architecture: any
 Depends: ${shlibs:Depends}
+Provides: emotion-bin
 Description: Test programs for Emotion
  This package contains test programs for the Emotion library.

diff --git a/debian/docs b/debian/docs
index bac2291..fcdccbb 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,6 @@
+AUTHORS
+README
+TODO
+NEWS
 COPYING
 COPYING-PLAIN

diff --git a/debian/emotion0-test.files b/debian/emotion0-bin.files
similarity index 61%
rename from debian/emotion0-test.files
rename to debian/emotion0-bin.files
index 436e4f1..207ff48 100644 (file)
--- a/debian/emotion0-test.files
+++ b/debian/emotion0-bin.files
@@ -1,2 +1,2 @@
-usr/bin/emotion_test
+usr/bin/emotion_*
 usr/share/emotion/data/theme.edj