[pkg-fso-commits] [SCM] openmoko-files, various files for the Openmoko devices branch, master, updated. debian/20090202-1-10-gbd808bc

[Luca Capello]

The following commit has been merged in the master branch:
commit 9cff73f98abdc6310dddcf7309c66772bcfd6b9f
Author: Luca Capello <luca at pca.it>
Date:   Thu May 28 11:01:09 2009 +0200

    debian/control: remove useless fso-config-gta* Conflicts:

diff --git a/debian/changelog b/debian/changelog
index 8758036..2a7d17a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ openmoko-files (20090202-2) UNRELEASED; urgency=low
     + minimize differences with non-freesmartphone.org packages in
       the last sentence of the long Description:.
     + correct GTA01 Neo 1973 name in fso-config-gta01 Description:.
+    - remove useless fso-config-gta* Conflicts:.
   * debian/copyright:
     + update Debian copyright assignment to 2009.
     + add Joachim Breitner for the Debian packaging.
diff --git a/debian/control b/debian/control
index c8841fe..a98e8c2 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-fso/openmoko-files.git;a=summary
 Package: fso-config-gta02
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, fso-frameworkd (>= 0.8.4.3-1), fso-sounds-yue-base | fso-sounds
-Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7), fso-config-gta01
+Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
 Replaces: fso-config
 Provides: fso-config
 Description: configuration files for Openmoko GTA02 Neo FreeRunner
@@ -26,7 +26,7 @@ Description: configuration files for Openmoko GTA02 Neo FreeRunner
 Package: fso-config-gta01
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, fso-frameworkd (>= 0.8.4.3-1), fso-sounds-yue-base | fso-sounds
-Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7), fso-config-gta02
+Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
 Replaces: fso-config
 Provides: fso-config
 Description: configuration files for Openmoko GTA01 Neo 1973

-- 
openmoko-files, various files for the Openmoko devices