[SCM] C Bindings for the SFML Library branch, master, updated. upstream/1.3-41-gdc7f04e

[Gonéri Le Bouder]

The following commit has been merged in the master branch:
commit dc7f04ec1134817ab42be8adb439d6886e371bd2
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Sun Mar 29 15:28:29 2009 +0200

    libcsfml-dev conflicts on/replaces libcsfml1.deb3-dev

diff --git a/debian/changelog b/debian/changelog
index 2b59cf5..a9bf2f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libcsfml (1.4-1) experimental; urgency=low
 
+  [ Christoph Egger ] 
   * New Upstream Version
   * Drop patches now upstream
     * RM: add_destdir_to_makefile.patch
@@ -9,6 +10,9 @@ libcsfml (1.4-1) experimental; urgency=low
   * Change my Mailaddress
   * Wrap -dev package's depends 
 
+  [ Gonéri Le Bouder ]
+  * libcsfml-dev conflicts on/replaces libcsfml1.deb3-dev
+
  -- Christoph Egger <debian at christoph-egger.org>  Tue, 20 Jan 2009 19:33:08 +0100
 
 libcsfml (1.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5a8307a..87fd7be 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,8 @@ Architecture: any
 Depends: libcsfml-audio1.4 (= ${binary:Version}), libcsfml-graphics1.4 (= ${binary:Version}),
  libcsfml-network1.4 (= ${binary:Version}), libcsfml-system1.4 (= ${binary:Version}),
  libcsfml-window1.4 (= ${binary:Version})
+Conflicts: libcsfml1.deb3-dev
+Replaces: libcsfml1.deb3-dev
 Description: Developmentfiles for the C binding of SFML
  SFML is an simple and fast library for providing access
  to multimedia libraries. It can be used to develop OpenGL

-- 
C Bindings for the SFML Library