[SCM] Simple and fast multimedia library for C++ branch, master, updated. 6010b8276d95935214db2e4f91301e2a72f41997

[Gonéri Le Bouder]

The following commit has been merged in the master branch:
commit 6010b8276d95935214db2e4f91301e2a72f41997
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Thu Mar 26 22:00:43 2009 +0100

    libsfml-dev conflicts/replaces libsfml1.deb3-dev

diff --git a/debian/changelog b/debian/changelog
index eb9855c..608e7ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libsfml (1.4+repack1-1) unstable; urgency=low
 
+  [ Christoph Egger ]
   * New Upstream Version
   * Drop patches implemented upstream
     * RM: add_destdir_to_makefile.patch
@@ -15,6 +16,9 @@ libsfml (1.4+repack1-1) unstable; urgency=low
     * Separationg docs and examples from -dev package 
   * Change my E-Mail Address 
 
+  [ Gonéri Le Bouder ]
+  * libsfml-dev conflicts/replaces libsfml1.deb3-dev 
+
  -- Christoph Egger <debian at christoph-egger.org>  Sun, 25 Jan 2009 16:51:47 +0100
 
 libsfml (1.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0f7d764..de73b09 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,8 @@ Depends: libsfml-audio1.4 (= ${binary:Version}), libsfml-graphics1.4 (= ${binary
   libsfml-network1.4 (= ${binary:Version}), libsfml-system1.4 (= ${binary:Version}), 
   libsfml-window1.4 (= ${binary:Version})
 Recommends: libsfml1.4-doc
+Conflicts: libsfml1.deb3-dev
+Replaces: libsfml1.deb3-dev
 Suggests: libsfml1.4-dbg
 Description: Simple and fast cross-platform multimedia library - Development Files
  SFML is an modern multimedia library offering a wide range of subsystems

-- 
Simple and fast multimedia library for C++