[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. milestone5-180-g5848db1

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 81b796d58cd6b8378e6b97ea76226737f556d1b3
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Feb 2 21:26:31 2009 +0100

    Conflict against old zhone packages

diff --git a/debian/control b/debian/control
index 1dd2e31..4867f97 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, ppp
 Recommends: fso-config, fso-sounds
-Conflicts: frameworkd, python2.5 (<< 2.5.2-13), openmoko-panel-plugin (<= 0.8-1), fso-frameworkd-wireless-glue
+Conflicts: frameworkd, python2.5 (<< 2.5.2-13), fso-frameworkd-wireless-glue, openmoko-panel-plugin (<= 0.8-1), zhone (<< 0-git20090202)
 Replaces: frameworkd, fso-frameworkd (<< 0.2.0-git20080909-7), fso-frameworkd-wireless-glue
 Provides: frameworkd
 Description: freemsmartphone.org Framework Daemon

-- 
FSO frameworkd Debian packaging