[pkg-fso-commits] [SCM] openmoko-files-nonfree, various not DFSG-free files for the Openmoko devices branch, master, updated. debian/20080911-1-1-g401f811

[Luca Capello]

The following commit has been merged in the master branch:
commit 401f8118a30e899cf5a7db8d0530d29da68adb17
Author: Luca Capello <luca at pca.it>
Date:   Wed Oct 29 02:08:10 2008 +0100

    debian/control: do not Conflicts: with nor Replaces: fso-sounds

diff --git a/debian/changelog b/debian/changelog
index c9ce160..ff7e389 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openmoko-files-nonfree (20080911-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - do not Conflicts: with nor Replaces: fso-sounds, since
+      different fso-sounds-* package can be installed together.
+
+ --
+
 openmoko-files-nonfree (20080911-1) pkg-fso; urgency=low
 
   * Initial release.
diff --git a/debian/control b/debian/control
index 6e845a8..e8b2159 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-fso/openmoko-files-nonfree.git;a=summa
 Package: fso-sounds-openmoko-nonfree
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: fso-sounds, fso-frameworkd (<< 0.2.0-git20080909-7)
-Replaces: fso-sounds
+Conflicts: fso-frameworkd (<< 0.2.0-git20080909-7)
 Provides: fso-sounds
 Description: Openmoko ringtones for the FreeSmartphone.Org frameworkd
  This packages provides the non-free ringtone files distributed by

-- 
openmoko-files-nonfree, various not DFSG-free files for the Openmoko devices