[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. milestone4-153-g7edf26d

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit b04668bf9016bcd2e56aa2fbb7a435212358d0aa
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 18 15:27:15 2008 +0100

    Conflict with pre-milestone4 versions of openmoko-panel-plugins

diff --git a/debian/changelog b/debian/changelog
index a5e9580..54bf5d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ fso-frameworkd (0.8.4.3-1) UNRELEASED; urgency=low
     /var/lib/freesmartphone
   * Conflict with earlier versions of python2.5, due to #505318 in previous
     versions
+  * Conflict with pre-milestone4 versions of openmoko-panel-plugins
 
  -- Joachim Breitner <nomeata at debian.org>  Tue, 11 Nov 2008 16:59:56 +0100
 
diff --git a/debian/control b/debian/control
index ecfc4f1..5174931 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: fso-frameworkd
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-serial, python-yaml, python-gst0.10, gstreamer0.10-alsa, python-dbus, gsm0710muxd, dbus, alsa-utils, fso-frameworkd-wireless-glue, ppp
 Recommends: fso-config, fso-sounds
-Conflicts: frameworkd, python2.5 (<< 2.5.2-13)
+Conflicts: frameworkd, python2.5 (<< 2.5.2-13), openmoko-panel-plugins (<= 0.5-1.3)
 Replaces: frameworkd, fso-frameworkd (<< 0.2.0-git20080909-7)
 Provides: frameworkd
 Description: freemsmartphone.org Framework Daemon

-- 
FSO frameworkd Debian packaging