[SCM] libbluray/master: Merge libbluray-bdj to libbluray0.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0b4d7ed44bb5d5d72e7a73d46d357a19551bf8f7
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Apr 27 16:15:36 2011 -0400

    Merge libbluray-bdj to libbluray0.

diff --git a/debian/control b/debian/control
index f957001..f11700a 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,9 @@ Depends: ${shlibs:Depends},
          default-jre-headless | java2-runtime-headless,
          ${java:Depends},
          ${misc:Depends}
+Provides: libbluray-bdj
+Replaces: libbluray-bdj
+Conflicts: libbluray-bdj
 Description: Blu-ray disc playback support library (libraries)
  libbluray is an open-source library designed for Blu-Ray Discs playback for
  media players, like VLC or MPlayer. This research project is developed by an

-- 
libbluray packaging