rev 12984 - branches/kde4.2/packages/phonon/debian

[Modestas Vainius]

Author: modax-guest
Date: 2008-12-19 23:42:56 +0000 (Fri, 19 Dec 2008)
New Revision: 12984

Modified:
   branches/kde4.2/packages/phonon/debian/changelog
   branches/kde4.2/packages/phonon/debian/control
Log:
pbuilder experimental satisfydepends get confused by this conflict. Tweak it a bit

Modified: branches/kde4.2/packages/phonon/debian/changelog
===================================================================
--- branches/kde4.2/packages/phonon/debian/changelog	2008-12-19 23:25:35 UTC (rev 12983)
+++ branches/kde4.2/packages/phonon/debian/changelog	2008-12-19 23:42:56 UTC (rev 12984)
@@ -1,4 +1,4 @@
-phonon (4:4.2.80+svn898997-0r1) UNRELEASED; urgency=low
+phonon (4:4.2.80+svn898997-0r2) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -19,10 +19,10 @@
 
   +++ Changes by George Kiagiadakis:
 
-  * Build-conflict with the experimental libxine-dev (>= 1.1.90) as the
+  * Build-conflict with the experimental libxine2 as the
     phonon-xine backend cannot build with it.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 19 Dec 2008 22:17:13 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Dec 2008 01:39:44 +0200
 
 phonon (4:4.2.0-2) unstable; urgency=low
 

Modified: branches/kde4.2/packages/phonon/debian/control
===================================================================
--- branches/kde4.2/packages/phonon/debian/control	2008-12-19 23:25:35 UTC (rev 12983)
+++ branches/kde4.2/packages/phonon/debian/control	2008-12-19 23:42:56 UTC (rev 12984)
@@ -7,7 +7,7 @@
  libqt4-dev, automoc, libglu1-mesa-dev, libqt4-opengl-dev, libxml2-dev, libglib2.0-dev,
  libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libxine-dev,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Build-Conflicts: libxine-dev (>= 1.1.90)
+Build-Conflicts: libxine2
 Standards-Version: 3.8.0
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/phonon