[sdformat] 01/02: Conflict with libsdformat1. (Closes: #747393)

[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 f03ab478ed7f664a6f8f4873c47d7561ce9b0222
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Thu May 8 17:21:46 2014 +0000

    Conflict with libsdformat1. (Closes: #747393)
    
    SDF files are the same. Upstream is handling the issue at:
    https://bitbucket.org/osrf/sdformat-release/issue/2
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index d61db11..9e9e187 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${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

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