[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.8.4.3-20081118-1-2-gab0ac45

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 92936dc12e84d1cba7169f99903fe8f48dd4d5a9
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 18 16:08:17 2008 +0100

    Typo in openmoko-panel-plugin package name

diff --git a/debian/changelog b/debian/changelog
index 284b057..7eab325 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fso-frameworkd (0.8.4.3-20081118-2) UNRELEASED; urgency=low
+
+  * Typo in openmoko-panel-plugin package name
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 18 Nov 2008 16:08:04 +0100
+
 fso-frameworkd (0.8.4.3-20081118-1) pkg-fso; urgency=low
 
   * New snapshot from upstream stablization branch 
diff --git a/debian/control b/debian/control
index 5174931..e2717df 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), openmoko-panel-plugins (<= 0.5-1.3)
+Conflicts: frameworkd, python2.5 (<< 2.5.2-13), openmoko-panel-plugin (<= 0.5-1.3)
 Replaces: frameworkd, fso-frameworkd (<< 0.2.0-git20080909-7)
 Provides: frameworkd
 Description: freemsmartphone.org Framework Daemon

-- 
FSO frameworkd Debian packaging