Resolved conflict between revisions

diff --git a/trunk/ecore/debian/changelog b/trunk/ecore/debian/changelog
index 70fe5aa..3196f93 100644 (file)
--- a/trunk/ecore/debian/changelog
+++ b/trunk/ecore/debian/changelog
@@ -1,7 +1,13 @@
+ecore (0.9.9.041-maemo.5) unstable; urgency=low
+
+  * debian/control: Build libecore0-imf and libecore0-imf-evas.
+
+ -- Eduardo Lima (Etrunko) <eduardo.lima@indt.org.br>  Sun, 09 Dec 2007 17:21:29 -0200
+
 ecore (0.9.9.041-maemo.4) unstable; urgency=low
 
   * rules: use BUILD_DEB_OPTIONS for n770 and n8x0 variants
-  * rules: use quilt instead of simple-patchsys 
+  * rules: use quilt instead of simple-patchsys
 
  -- Ed Bartosh <bartosh@gmail.com>  Sun,  9 Dec 2007 19:04:32 +0200
 
@@ -32,7 +38,7 @@ ecore (0.9.9.041-maemo.1) unstable; urgency=low
 
 ecore (0.9.9.040-maemo.1) unstable; urgency=low
 
-  * Maemo build 
+  * Maemo build
 
  -- Ed Bartosh <bartosh@gmail.com>  Sat, 18 Aug 2007 21:12:48 +0300