[sdformat] 03/04: Move the conflict from library to sdformat-sdf

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository sdformat.

commit e0333ea79ea6f2286f38075030926f740505dbe6
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Fri May 16 17:33:49 2014 +0000

    Move the conflict from library to sdformat-sdf
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 8084ad4..18aa4a3 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,6 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:  sdformat-sdf (>= ${source:Version}),
           ${shlibs:Depends},
           ${misc:Depends}
-Conflicts: libsdformat1
 Multi-Arch: same
 Description: Simulation Description Format (SDF) parser - Shared library
  SDF is an XML file format that describes environments, objects, and robots
@@ -72,6 +71,7 @@ Architecture: all
 Section: libdevel
 Depends: ${misc:Depends}
 Multi-Arch: foreign
+Conflicts: libsdformat1
 Description: Simulation Description Format (SDF) parser - SDF files
  SDF is an XML file format that describes environments, objects, and robots
  in a manner suitable for robotic applications. SDF is capable of representing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdformat.git