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

[msp at alioth.debian.org]

Author: msp
Date: Sun Oct 11 20:53:38 2009
New Revision: 7666

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7666
Log:
* Add Build-Conflicts: libx264-dev  (patent issue)
  - Fixes "uninstallable on i386, was built with libx264" (Closes: #550516)

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=7666&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Sun Oct 11 20:53:38 2009
@@ -1,3 +1,10 @@
+opal (3.6.6~dfsg-3) UNRELEASED; urgency=low
+
+  * Add Build-Conflicts: libx264-dev  (patent issue)
+    - Fixes "uninstallable on i386, was built with libx264" (Closes: #550516)
+
+ -- Mark Purcell <msp at debian.org>  Mon, 12 Oct 2009 07:51:01 +1100
+
 opal (3.6.6~dfsg-2) unstable; urgency=low
 
   * Add missing Build-Depends: libcapi20-dev, libavcodec-dev

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=7666&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Sun Oct 11 20:53:38 2009
@@ -7,7 +7,8 @@
  libpt-dev (>= 2.6.5),
  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
+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
 Standards-Version: 3.8.3
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/trunk/