summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2006-02-25 11:27:47 +0000
committerReinhard Tartler <siretart@tauware.de>2006-02-25 11:27:47 +0000
commit889f505e1778c7c99fd7ec0d42f9a33a1c2bbaab (patch)
tree3a967e49280607d112fb0c8061b2cbe5f59a2f5f
parent072ac74a5a4ebc3c74da94bc14c1f251680cc7b3 (diff)
downloadxine-lib-889f505e1778c7c99fd7ec0d42f9a33a1c2bbaab.tar.gz
xine-lib-889f505e1778c7c99fd7ec0d42f9a33a1c2bbaab.tar.bz2
conflicts/replaces with obsolete package 'xine' to close debian #300852
CVS patchset: 7907 CVS date: 2006/02/25 11:27:47
-rw-r--r--debian/changelog4
-rw-r--r--debian/control4
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index c0072da87..ea61e9abf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xine-lib (1.1.1-2) unstable; urgency=low
* Use external libmad (Closes: #336437)
* enable support for libxvmc1, now that we have xorg in debian
+ (Closes: #281572)
+ * Conflict/Replaces obsolete package 'xine' (Closes: #300852)
- -- Reinhard Tartler <siretart@tauware.de> Sat, 25 Feb 2006 09:39:33 +0100
+ -- Reinhard Tartler <siretart@tauware.de> Sat, 25 Feb 2006 12:26:10 +0100
xine-lib (1.1.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 522e09400..a19afe7e3 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,8 @@ Architecture: any
Depends: ${shlibs:Depends}
Recommends: ${shlibs:Recommends}
Suggests: ${shlibs:Suggests}, libartsc0
-Conflicts: sinek(<<0.7), xine-ui (<< 0.9.10)
-Replaces: xine-dvdnav
+Conflicts: sinek(<<0.7), xine-ui (<< 0.9.10), xine
+Replaces: xine-dvdnav, xine
Description: the xine video/media player library, binary files
This is the xine media player library (libxine).
Libxine provides the complete infrastructure for a video/media player.