summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-10-23 23:15:36 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-10-23 23:15:36 +0100
commit7f0cb19782f4ac1de0f35bf3321be03b30a7179c (patch)
treeaf7539b3eb33846dffe4645d52aa00a0720ed82e /debian
parent9b6900307db58fd1adcc1311e1938f74225bc549 (diff)
parent063fce405f6dd99f78040a0087ab4c602c5b96fc (diff)
downloadxine-lib-7f0cb19782f4ac1de0f35bf3321be03b30a7179c.tar.gz
xine-lib-7f0cb19782f4ac1de0f35bf3321be03b30a7179c.tar.bz2
Merge from 1.1, updating plugin Conflicts/Replaces accordingly.
Diffstat (limited to 'debian')
-rw-r--r--debian/control2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index 7ef909890..e3f6491d7 100644
--- a/debian/control
+++ b/debian/control
@@ -66,6 +66,8 @@ Architecture: any
Depends: ${shlibs:Depends}
Recommends: ${shlibs:Recommends}, libxine2-doc | libxine-doc
Suggests: ${shlibs:Suggests}, libartsc0
+Conflicts: libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x
+Replaces: libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x
Description: the xine video/media player library, binary files
This is the xine media player library (libxine).
.