[Pkg-voip-commits] r7669 - in /opal/trunk/debian: changelog control

[msp at alioth.debian.org]

Author: msp
Date: Sun Oct 11 21:08:40 2009
New Revision: 7669

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7669
Log:
Add Build-Conflicts: libx264-dev  (fails DFSG)

Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/control

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=7669&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Sun Oct 11 21:08:40 2009
@@ -1,6 +1,6 @@
 opal (3.6.6~dfsg-3) unstable; urgency=low
 
-  * Add Build-Conflicts: libx264-dev  (patent issue)
+  * Add Build-Conflicts: libx264-dev  (fails DFSG)
     - Fixes "uninstallable on i386, was built with libx264" (Closes: #550516)
   * Remove simpleopal debug file, will be resurrected if really needed
     (Closes: #550168)

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=7669&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Sun Oct 11 21:08:40 2009
@@ -8,7 +8,7 @@
  libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev, libcelt-dev,
  libcapi20-dev, libavcodec-dev
 Build-Conflicts: libopal3.6.6, libopal3.6.4, libopal3.6.3, libopal3.6.1, libopal3.4.2, libopal3.4.1, libopal3.3-beta1, libopal-snapshot-dev, libopal-dev, libopal-2.2, libopal-2.2.0, libopal-2.2-ptrace, libopal-2.2-develop,
- libx264-dev
+ libx264-dev	# fails DFSG
 Standards-Version: 3.8.3
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/trunk/