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

[Rico Rommel]

The following commit has been merged in the debian branch:
commit 0b1e4ffd7258ca756f6d6e6bb1f27b1789e73b5b
Author: Rico Rommel <rico at bierrommel.de>
Date:   Wed Sep 28 17:41:03 2011 +0200

    fso-frameworkd-gta0X should conflict each other

diff --git a/debian/changelog b/debian/changelog
index 780e591..d601998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fso-frameworkd (0.9.5.9+git20110512-1.1) unstable; urgency=low
+
+  * fso-frameworkd-gta0X should conflict each other 
+
+ -- Rico Rommel <rico at bierrommel.de>  Wed, 28 Sep 2011 17:37:22 +0200
+
 fso-frameworkd (0.9.5.9+git20110512-1) unstable; urgency=low
 
   * new upstrem release
diff --git a/debian/control b/debian/control
index 5cd9513..3c9272c 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Description: freesmartphone.org Framework Daemon
 Package: fso-frameworkd-gta02
 Architecture: all
 Depends: ${misc:Depends}, fso-usaged-openmoko, fso-deviced-openmoko, fso-gsmd-openmoko, fso-frameworkd
-Conflicts: fso-config-gta02
+Conflicts: fso-config-gta02, fso-frameworkd-gta01
 Description: configuration files for freesmartphone.org Framework Daemon for GTA02
  This package provides the backend daemon of the freesmartphone.org software
  stack. It provides all telephone related features, such as accepting and making
@@ -54,7 +54,7 @@ Description: configuration files for freesmartphone.org Framework Daemon for GTA
 Package: fso-frameworkd-gta01
 Architecture: all
 Depends: ${misc:Depends}, fso-usaged-openmoko, fso-deviced-openmoko, fso-gsmd-openmoko, fso-frameworkd
-Conflicts: fso-config-gta01
+Conflicts: fso-config-gta01, fso-frameworkd-gta02
 Description: configuration files for freesmartphone.org Framework Daemon for GTA01
  This package provides the backend daemon of the freesmartphone.org software
  stack. It provides all telephone related features, such as accepting and making

-- 
FSO frameworkd Debian packaging