[Pkg-e-commits] [SCM] Enlightenment DR17 advanced canvas library branch, master, updated. debian/0.9.9.050+svn20081206-1-2105-g5ac2e09

[Albin Tonnerre]

The following commit has been merged in the master branch:
commit 5ac2e09f73a0c82bba6b590c55061310fc1b4575
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Wed Feb 25 12:32:13 2009 +0100

    revert previous change and use libevas-engines and libevas-engines-extras. the issues created by an engines<->evas interface change are better handled by bumping soname for libevas

diff --git a/debian/changelog b/debian/changelog
index 848bb7c..5684335 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,17 @@
 evas (0.9.9.050+svn20090204-1) experimental; urgency=low
 
   * New SVN snapshot
-    - libevas-*0.9.9.050a* are now libevas-*0.9.9.050b* due to API change
+    - libevas-0.9.9.050a is now libevas-0.9.9.050b due to API change
     - refresh patches
     - Use new 'make doc' target to generate the documentation:
       + Add --enable-doc to configure options
       + use 'make doc'
       + build-depend on doxygen
-  * libevas-engines-0.9.9.50b and libevas-engines-extras-0.9.9.50b respectively
-    no longer Provides: libevas-engines-{,extra}
-  * Make libevas-0.9.9.050b Conflicts: libevas-engines, libevas-engines-extras
-    - prevents engines linked against previous versions of evas to be installed
-      alongside new versions.
+  * Revert back to using libevas-engines and libevas-engines-extras, if the
+    engines <-> evas interface breaks, it will be handled by bumping the
+    SONAME for libevas
 
- -- Albin Tonnerre <albin.tonnerre at gmail.com>  Thu, 05 Feb 2009 18:10:11 +0100
+ -- Albin Tonnerre <albin.tonnerre at gmail.com>  Wed, 25 Feb 2009 12:30:36 +0100
 
 evas (0.9.9.050+svn20081206-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 5229fc8..a2c5e2d 100644
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,9 @@ Homepage: http://www.enlightenment.org
 Package: libevas-0.9.9.050b
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libevas-0.9.9.050b-engines
+Recommends: libevas-engines (>= 0.9.9.050+svn20090204)
 Provides: libevas0
-Conflicts: libevas0, libevas-engines, libevas-engines-extras
+Conflicts: libevas0
 Description: Enlightenment DR17 advanced canvas library
  Evas is an advanced canvas library, providing six engines for rendering: X11,
  OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
@@ -76,10 +76,10 @@ Description: enlightenment advanced canvas library
  easier to interpret core dumps. The libraries are installed in
  /usr/lib/debug and are automatically used by gdb.
 
-Package: libevas-0.9.9.050b-engines
+Package: libevas-engines
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libevas-engines
+Conflicts: libevas-0.9.9.050a-engines
 Description: Evas module providingg the framebuffer render engine
  Evas is an advanced canvas library, providing six engines for rendering: X11,
  OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
@@ -92,10 +92,10 @@ Description: Evas module providingg the framebuffer render engine
   - software/X11
   - xrender/X11
 
-Package: libevas-0.9.9.050b-engines-extras
+Package: libevas-engines-extras
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libevas-0.9.9.050b-engines
-Conflicts: libevas-engines-extras
+Depends: ${shlibs:Depends}, ${misc:Depends}, libevas-engines
+Conflicts: libevas-0.9.9.050a-engines-extras
 Description: Evas module providing the Xrender engine
  Evas is an advanced canvas library, providing six engines for rendering: X11,
  OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
diff --git a/debian/libevas-0.9.9.050b-engines-extras.install b/debian/libevas-engines-extras.install
similarity index 100%
rename from debian/libevas-0.9.9.050b-engines-extras.install
rename to debian/libevas-engines-extras.install
diff --git a/debian/libevas-0.9.9.050b-engines.install b/debian/libevas-engines.install
similarity index 100%
rename from debian/libevas-0.9.9.050b-engines.install
rename to debian/libevas-engines.install

-- 
Enlightenment DR17 advanced canvas library