[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.9.5.9+git20110512-1-6-g61137d8

[Rico Rommel]

The following commit has been merged in the debian branch:
commit 61137d81453bde45f7090d2ad342b86098ac54df
Author: Rico Rommel <rico at bierrommel.de>
Date:   Sat Oct 22 15:59:02 2011 +0200

    add conflict with fso-config-gta0X

diff --git a/debian/changelog b/debian/changelog
index 7c8b351..d2a71cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fso-frameworkd (0.9.5.9+git20110512-3) unstable; urgency=low
+
+  * add conflict betwween fsoframworkd and fso-config-gta02 + fso-config-gta01 (Closes: #646111)
+
+ -- Rico Rommel <rico at bierrommel.de>  Sat, 22 Oct 2011 15:53:43 +0200
+
 fso-frameworkd (0.9.5.9+git20110512-2) unstable; urgency=low
 
   * fso-frameworkd-gta0X should conflict each other 
diff --git a/debian/control b/debian/control
index 3c9272c..92d0cef 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends},
          dbus,
          python-phoneutils
 Recommends: fso-sounds, fso-usaged, python-rtc
-Conflicts: frameworkd, python2.5 (<< 2.5.2-13), fso-frameworkd-wireless-glue, openmoko-panel-plugin (<= 0.8-1), zhone (<< 0-git20090202)
+Conflicts: frameworkd, python2.5 (<< 2.5.2-13), fso-frameworkd-wireless-glue, openmoko-panel-plugin (<= 0.8-1), zhone (<< 0-git20090202), fso-config-gta01, fso-config-gta02
 Replaces: frameworkd, fso-frameworkd-wireless-glue
 Provides: frameworkd
 Description: freesmartphone.org Framework Daemon

-- 
FSO frameworkd Debian packaging